Implement retry related functions am: f24be08339 am: 3a74866331
am: 56c48fdd04

Change-Id: Iff74ebc5f901011c6bb35fd9ea32d8aef0789ed5