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

Change-Id: I857edb9dcf8c04fcf38444ebab64a182fe0dc788
BUG: 129345239