Merge master@5428150 into git_qt-dev.
am: 8cb08b92e5

Change-Id: I93c04552a5137b17c6c65660457fdf1541b554fd