tree 50fca428a5b0f0016a73720e5ff3cbb1bc24cbf4
parent dcfabc705f91e6aca56c6595ce7973ac031c9455
parent 21fdeb424c513e7b9839e3fe3f9095dc3c464a0b
author Nandana Dutt <nandana@google.com> 1543836886 -0800
committer android-build-merger <android-build-merger@google.com> 1543836886 -0800

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

Change-Id: I53359823701e5dedd43cdfc9b6bb53b45b42ecea