Merge "Do not trim unless we are actually checkpointing" am: 2268c285a5 am: 9de5e3c028
am: 2b108efef1

Change-Id: I7ef6807671da4a1f34a90a5c5c14d3acca814d57