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

Change-Id: Ic99554de12e41fe8711706e970e9d5b34894aee9
BUG: 129345239