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

Change-Id: I67f4b680887fa8fc373113d02cb9a1234b2a7353
BUG: 129345239