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

Change-Id: Ie6dcf7700653422ad7ce36d316fbd01dc8c2b5f4
BUG: 129345239