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

Change-Id: I142a3f6b46dd832c5dbb864c6f3faa47ef99e4c1