Merge master@5428150 into git_qt-dev.

Change-Id: I48d846f092f1faa29b7bdc0dd2a3c1e6bdde6f29
BUG: 129345239