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

Change-Id: I6f3edfe3c3e98f03793bc3e598caff8d677422bc