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

Change-Id: I731ec7c6f56856a7ac64db12464731f0082f68d9