[automerger skipped] Merge changes from topic "b138787339-daggerize" into qt-qpr1-dev am: 9eb5598635
am: 4ef49060f4 -s ours
am skip reason: change_id Ie24acd33b0d81ae2112aead0c0d5a8658e04994e with SHA1 c195ea80ae is in history

Change-Id: I893062eed0daa0f083f00ce095a527a04e95a842