Merge master@5428150 into git_qt-dev.

Change-Id: Iaa713ac8b27d311b85788e91164958a4069eff0e
BUG: 129345239