Handle suffixes for duplicates of duplicates

Change-Id: Ie3e4323c966e7e370ea2c4a70cb9572d5fa002af