Rm dupe I accidentally created

Change-Id: I87134f3eee0e37549ec8156d5b407e96aa2e000c
Merge "Rm dupe I accidentally created" into production