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

Change-Id: I8d581a6fe3e4a4902494de1ce474181f9c12f078