Merge master@5428150 into git_qt-dev.

Change-Id: I722f2f84c552b5fdce2aee867c740ea41093d614
BUG: 129345239