Merge master@5428150 into git_qt-dev.

Change-Id: Ie6634d6824af908941b6ea6d25e8f5c5d923d065
BUG: 129345239