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

Change-Id: I7cb53490bc94631432bfd9d1cb1511f0665468bc