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

Change-Id: I5db1636a8c694e8b10c04800e7959747304c6b1b