Merge "Use correct Statuses from Checkpoint code" am: 8d4164f92f
am: 7d9a965419

Change-Id: If69ffb3d977cd545ff04609b1240dbef563f0748