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

Change-Id: I060913901099ff46e65cea2af8bdcc953d7cceb7
BUG: 129345239