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

Change-Id: Ibe38131f3e562bfe823e87acc1fe1700f29b7c9a
BUG: 129345239