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

Change-Id: Ib1e275b5f50135331546d2400b1edefe24b0833d