Merge master@5428150 into git_qt-dev.

Change-Id: Icf415dcb913b8ba959f6056dc190951b06a4923b
BUG: 129345239