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

Change-Id: I4a82f872dd706ac422ff596217e6f67fee8b7f91
BUG: 129345239