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

Change-Id: Ie6d68ac0c61b310e6755dba9f86dbe4fc11635d7
BUG: 129345239