Merge changes from topic "ext4 checkpointing"
am: fe0e345ef0

Change-Id: I55efd0af0afa2911f4474da851bba006da383a0f