Merge master@5428150 into git_qt-dev.
am: a27ebe490c

Change-Id: I479ce8a91a5d285141c94b04b13a0fefd4c3d704