Merge "Add fsync for renaming user ce key path"
am: 622585b11b

Change-Id: Ic110b6725790398a235d0766330b0899ab52bedb