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

Change-Id: I535a555e659ba80e2dc839324b3d4672e8918661
BUG: 129345239