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

Change-Id: Iabfa23869667cc25a4bfa9f28d8c03b8395a70ed
BUG: 129345239