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

Change-Id: I8e1a73d23a139428e401cdc88d4966da52714e49
BUG: 129345239