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

Change-Id: I32380553a86f92703bc51713310a9c8d117d91f2
BUG: 129345239