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

Change-Id: I2cbe2b7fdf97ed4c25e6acb66693a5eb9c40bd3a
BUG: 129345239