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

Change-Id: Ibecc2667098e73c9d794d7cd683282f2e910d8ba
BUG: 129345239