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

Change-Id: I068d7a1c63a63cf2d75c3078aa2d3ffacdb558db
BUG: 129345239