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

Change-Id: I2c481ba8f3c62df7d1862ff9c0d691044dd391a8
BUG: 129345239