Merge "Remove unused rename code"
am: ebad925405

Change-Id: Ia2a818ea8377bb02199c62eb8fda9cc6b8ae6f35