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

Change-Id: I89cc0d8bc3ddaf757c6d4704d7097662a5fbda8c