Merge master@5428150 into git_qt-dev.
am: 12f0172c80

Change-Id: Ieb913ca6f776a63bc9e33349019bfcfa5c6b16be