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

Change-Id: I8cae3688641709567e174b605df6b224e25f8c16