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

Change-Id: I9e416838d26a8df53c95bab68d90f85c779601ab