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

Change-Id: I4270e3449b0fa0a061ea5b2a4964d60db1336530
BUG: 129345239