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

Change-Id: Ie4271ea36ca14b3bd9de33356152ea9d8327633d