Merge "Use REPLACE_EXISTING for rename(2) workaround." into rvc-dev am: 78243297 am: 88214048 am: a6908bbb Change-Id: I187ff5befc096e63b34d59a9da7e947032caa6b3