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

Change-Id: I59cfc72153974b6593297f98cb5a5ffac5d2f8bb
BUG: 129345239