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

Change-Id: I21ed85532c2a14caf5e75a34c7566f66182640bb
BUG: 129345239