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

Change-Id: Iff82db9a6ddab93858bc5bf13c73c1dd97c679c6