Implement retry related functions
am: f24be08339

Change-Id: Ic9e0d6d2fa6b07459eae57123f1f53b2a6179249