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

Change-Id: I1b38d8622315c51f0425cfbc88c8a674147de705
BUG: 129345239