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

Change-Id: I91c009ef1eea0be5e4811ac3da5f7f68bcf18da9
BUG: 129345239