tree ffdad4fddeeac46437277e23117c2dd40f1bcc42
parent 6b76f44704fc0be269e6d625a15cfb65dc6c6a66
parent a1a428189afc4a82299c0ec1c6803cc8894fe3a4
author Nandana Dutt <nandana@google.com> 1543836137 -0800
committer android-build-merger <android-build-merger@google.com> 1543836137 -0800

Merge "Add rename code back"
am: a1a428189a

Change-Id: Iaae6b187147d50beb61d7bb4627513318b1996e1