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

Change-Id: I0749829bf3a1273ec7049f0ca4b242cb6b575c1f
BUG: 129345239