Merge changes from topic "chromehole" into qt-dev am: c76ced397b am: 1c1dc4ddc8 am: 6ce8c7a1a8
am: f38e6059c7

Change-Id: I444143975b63465ffa9a0d7e7fbe2c7a80b67657