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

Change-Id: If4cfdc0cf34522553781e65f1f8c47a0ea0c7024
BUG: 129345239