Merge "Merge changes Ibcb91105,I0218f367 am: 7db54229f5 am: 94522117bd" into qt-dev-plus-aosp