Merge "Maintain compatibility by deleting target directory before renaming...
Merge "Maintain compatibility by deleting target directory before renaming into it." into rvc-dev am: 5c77ec2e am: 9481bbbf
Change-Id: I890261814a306e368617e06fbed35e82f8710f6d