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

Change-Id: I4c4cf5d67030a85a1fd7895c71cf2de548ab6f4d
BUG: 129345239