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

Change-Id: I2b18737e9e819269ef7215a03811e8ae5c27155c
BUG: 129345239