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

Change-Id: I2d7aaadc43b88671b63f2b09b5276bf67ea13b5a
BUG: 129345239