Merge changes from topic "no_dupe_stuiff_qpr" into qt-qpr1-dev
am: 3d894e1dbd

Change-Id: Iabd68a5b6e2daa2fffa1a2c180ed57d528b5da9c