Remove Duplicates
Change-Id: Ic5def22d993921d6378fd8c45c9d772dbe87d534