[automerger skipped] Merge changes from topic "no_dupe_stuiff_qpr" into qt-qpr1-dev am: 3d894e1dbd
am: 548869ac0d -s ours
am skip reason: change_id Ib9bb38d357e0d87a9b7da3456c97029a8b0342a3 with SHA1 137e7812f0 is in history

Change-Id: Ia48ceab15ed6eefeb022c7e8d7a582831d1772ba