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

Change-Id: Ia569027d46e853adeb868f5c4bd83b4619452c61