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

Change-Id: I1091bf4ecb36441bec7651e20222b4d34c69a443
BUG: 129345239