Merge "Copy the retry split from master to oc-dev" into oc-dev am: 75c104f883
am: 59608a4ab1

Change-Id: I0f08b0feb21dcf450be08be87f15d192acbedddf