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

Change-Id: I2aff0d8c8a0a1f3ee34265febe433284a03b5e7e
BUG: 129345239