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

Change-Id: I7318640408e30685d9530d95e056844f30c0d0aa
BUG: 129345239