Merge changes from topic "chromehole" into qt-dev
am: c76ced397b

Change-Id: I2c558d011e500668913527fd3d9a07d9e815c643