Merge changes from topic "ext4 checkpointing" am: fe0e345ef0
am: 2b0fad7425

Change-Id: I4798a62f8f37bd1049895d56091f7cdd2a2a5ed2