Merge "Merge changes I2b059826,I64bee605 into qt-dev am: 565e2634e6" into qt-dev-plus-aosp