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

Change-Id: I94e1967f8d69de1c5a5f15331df64d402f775911
BUG: 129345239