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

Change-Id: I292847196b580c42a166d6ab3a11e322484f7e5a
BUG: 129345239