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

Change-Id: Ica3ed775529085371f0ed17944a420feea1c197d
BUG: 129345239