Merge changes from topic "b138787339-daggerize" into qt-qpr1-dev
am: 9eb5598635

Change-Id: Ieefe1a44fd64559beb7e7411fcc3407277f2ef31