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

Change-Id: If0296f38312743e0ca4fc8de18356d8e626bb334
BUG: 129345239