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

Change-Id: I94253898b8fefe7b5bed6ea080a759fc83941a1b
BUG: 129345239