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: Ic22968e3a1b65a7d9ad1b6397d1d6a6ac03b2b0e