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

Change-Id: I078e4ede7f1abc45a95f1d5b8baa61926c235b5a