Merge master@5428150 into git_qt-dev.

Change-Id: I988996e299a231e522836bf3cea8314eddaf53f4
BUG: 129345239