Merge "Change AtomicFile to use rename-into-place." into rvc-dev