Merge "Fix bug in WriteStringToFileAtomic"