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

Change-Id: Ic6a82de44de2b718ac206475a4b3c76125541a4b
BUG: 129345239