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

Change-Id: I0c95f1d53731a918e2eeb541ea22067aa2576bac
BUG: 129345239