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

Change-Id: Iced3cb988011310417483fa21d71913fd33362f5