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

Change-Id: I84559829bbaa69321df4581ff5b18599066a4e1c
BUG: 129345239