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

Change-Id: I422285de38de7d3500774e25efc69b46cc4d3cca
BUG: 129345239