Last commit made some duplicates

Change-Id: If026b3073c6c971cc5acf8b891ed2cf724f90d26