Merge master@5428150 into git_qt-dev. am: d3d4f4905d
am: 11dfe9291c

Change-Id: Ia7465069aad51da5b88153551ef359ee0a5ccef3