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

Change-Id: Ib6fd89248268bc88e299e2b62274bb71cf86593a
BUG: 129345239