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

Change-Id: I4c4051a94c6d4d5db5eda6a6ef373ef161e21e1a
BUG: 129345239