Merge changes I96ad00cb,I2b1193b9,I2850007f into qt-r1-dev am: 24c57b6a70
am: 0d9b47977b

Change-Id: I2c1ac8af91b4fa9d4088cf8860f89ad86ebb2833