Fixing a bug retry policy

* During last refactoring in policies it's been broken

Change-Id: I767742f04e69b309688d28967e03969bb59f3fb4
Merge "Fixing a bug retry policy"