Implement retry related functions am: f24be08339
am: 3a74866331

Change-Id: Ia90e4d1d0cb6491e98e421b0afb3d8123324c43d