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

Change-Id: I5d77bec31af7f63331ce64e5e906a8df1748d387