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

Change-Id: I6a8453fa3bf5d87116f15f1fb0237026f4687f78
BUG: 129345239