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

Change-Id: I675683694cc02ea9ebc66a75ade93a5f7058006f