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

Change-Id: I2e3b6072843e76e4b7a8894e3658e9c2ce1864e5
BUG: 129345239