Merge master@5428150 into git_qt-dev-plus-aosp.

Change-Id: I1c69d7c91e68fd4baba7b6510acf2a69e1a6c5d7
BUG: 129345239