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

Change-Id: I529a6c956f701a1a2612c0640bc60fc933cdb7af
BUG: 129345239