Ensure duplicates are removed from image list

Change-Id: Ia0cf83a893f070a975720c318eefa8e7f18edf32
Closes-Bug: 1355373
Merge "Ensure duplicates are removed from image list"