Merge changes I9a0bf442,Id4c7c086 into qt-qpr1-dev am: 20fd656400

Change-Id: I01d7602089fcbecb4f4a0a9f718abf9a600b0687