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

Change-Id: I05b66f64f0f941cde473d02d02e6c1714d7d4a6a