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

Change-Id: Iab4a62d752fbf4432cff21eb2ac34a52557582b8
BUG: 129345239