Merge master@5428150 into git_qt-dev.
am: 104147829e

Change-Id: Icedfd8f51b3fe3a5a17a8ff07c926a47c0834c46