[automerger skipped] Merge "Change AtomicFile to use rename-into-place." into...
[automerger skipped] Merge "Change AtomicFile to use rename-into-place." into rvc-dev am: 0d23267a am: 85d6bd2b -s ours
am skip reason: Change-Id I5c4c438526a2aecdd2af18f71e16b41a05817c61 with SHA-1 b1a77067 is in history
Change-Id: I557545cc586c2b23c8e3918639e122202981cc5b