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

Change-Id: I60794d5732aaef95cbb96abd31038e60844097b1
BUG: 129345239