Merge "Make checkpointing work on ext4" am: ac244261c8
am: 61c3eaf068

Change-Id: I22a1b7c3c35aa164b00d4e4d176bcdf63df53353