PR#319 (reoponed version). (Imported from upstream's 8358302d47) Change-Id: I222c454620ab445d4906ee2c2b6a9ad80e56018e
8358302d47