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

Change-Id: I1cb194216b664add8b145ffe5bc0b6f56ec8c523
BUG: 129345239