Merge master@5428150 into git_qt-dev.

Change-Id: I62829f3a8753d958c0d19ca0feabd121dd65ac0a
BUG: 129345239