Complete the fixup of duplicates in EA

Change-Id: I40b94bd631aa58e2f8b77c713a79c50c26ad551a