Merge changes Iba1c82b0,Ia498f6dd,I16fd11f5 into qt-qpr1-dev
am: 40f8906f45

Change-Id: I9b04911a766ea0f3d08c7d05278a2bd67dedd9ac