Merge "Merge changes I342cd7d0,I2c55831b into qt-dev am: a58591179b" into qt-dev-plus-aosp