Merge "Add rename code back"
am: a1a428189a

Change-Id: Iaae6b187147d50beb61d7bb4627513318b1996e1