Merge "Merge changes I4e32a588,I202c5653 am: 003ab94333 am: b7ca85651f" into qt-dev-plus-aosp