Merge changes I261ad35f,Id2611b3c into qt-qpr1-dev
am: d76cc783f8

Change-Id: I1c5f830f78239541c37990330cfd2eebbe7af0d8