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

Change-Id: Iea225ccac1abcab67b9c83825e0557aa3e090f42
BUG: 129345239