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

Change-Id: Ie41fcb9112bb8d3a92a6953917d44ce1d4c281d7
BUG: 129345239