Merge "Add rename code back" am: a1a428189a
am: 217abc6f4c

Change-Id: Ib9c14dde91636862be91556d896653470e4f3266