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

Change-Id: I30afca794eaa5447375ca5464546a1ecadfb16a6
BUG: 129345239