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

Change-Id: I6ec4d7ef40a971744cbc14ebf3a9ec1071c0bb0a
BUG: 129345239