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

Change-Id: I2c20ba058c676c4c7ab582457a9dc67267d56132