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

Change-Id: I6bbdcba262d66af93170e70587af76642f789449