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

Change-Id: Icc31b310e0b57357fc6a9f3f6dd17caff8b48832
BUG: 129345239