Merge "Prevent abort in situations with recursive checkpoints"
am: 98ac0cce96

Change-Id: If18b10bdd5cfc2ffa30f9226f9d3763fa7044ad2