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

Change-Id: I52808b6fa2745139f2b636a34a109cd72ab2d1ae
BUG: 129345239