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

Change-Id: I4bd94d6dbfba7a386dbb68d3486ee3ec08ed1808