Merge changes Ie2fbc4a9,Id5918813,Ie61d5da3,I26a12ff6 into qt-r1-dev am: 35890aba0c
am: cc88adbb71

Change-Id: I9b925ff45f63a4df96b982cff2d267b2297df363