Merge "Add fsync for renaming user ce key path"