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

Change-Id: Ie0b2fe8bc2633b30edd319b09e2596ffa6d5d5cb
BUG: 129345239