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

Change-Id: I53359823701e5dedd43cdfc9b6bb53b45b42ecea