Merge "Doing sublisting after deduplication" into qt-dev am: 143c735ee6
am: d43ead222f

Change-Id: Ia893b1246e86479258c2c479409b93947b0395ff