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

Change-Id: Ice9562f96bde9db2da4ecca0ab08e006088c9271
BUG: 129345239