Merge "Use AtomicFile APIs correctly when reading." into mnc-dev