Merge master@5428150 into git_qt-dev.
am: 19dfeca019

Change-Id: Ic4ea5c76ec3473057fd2e097ebfcd63337a6cc90