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

Change-Id: Iafbdddb6c6ebb647746c7a3e743e925f278f6fda
BUG: 129345239