Merge "Switch Checkpoint Restore code to c style File ops" am: bc1901f8af
am: 73cfd4918b

Change-Id: I2df8869defe16ba3886f999dc993ab802b77086e