Merge "Remove unused rename code" am: ebad925405 am: 5964d5a460
am: 5c0c0dd109

Change-Id: I8797d6486df84e02f11f40c1ec06c42d644d6dad