Merge "Change checkpointing retry count to 2" into rvc-dev am: fb7bda9734

Change-Id: Ibd135e03f03f2b37cd6d5b2ccec5932fc03274a3