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

Change-Id: I9c989065fb62a5aa4df5de76841a1cbdf30a0023
BUG: 129345239