Merge changes Idbea7883,Ie49cec34 into qt-dev
am: 1526ab3ea0

Change-Id: Iddd4fe12c0da838d7279cb1a5282d03e756e32f2