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

Change-Id: I91d1349a394c491f5fcb6f9ebdd80f0308418ae6
BUG: 129345239