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

Change-Id: Ib5513522c9819215e42f8960c9e6d2231d0cf40c