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

Change-Id: I7160ca6a2c43affb930711a36cbdec8a0dc3f952
BUG: 129345239