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

Change-Id: I2450207dda942ef17ddeb6a40fef610e80796611
BUG: 129345239