Merge changes Ia3307593,I43126ce1 into qt-r1-dev am: bd698b99ca
am: 048f6a4ebb

Change-Id: I50389abf4272b92356045b787882e5070caac117