Merge "Add Merge side unspecified am: aa97199441 am: 59ebd698cf am: 7aed7b0551" into qt-r1-dev-plus-aosp