Merge master@5428150 into git_qt-dev.
am: 05f1427af4

Change-Id: I0e6ea869183ee6d11f1c0762de71aab1e5ca7c6c