Merge changes from topic "124962433" into qt-dev
am: 279cf4b9ef

Change-Id: I95ea95aec1ce78c89751899966f58b3f3fd41613