Merge "Move retry logic into its own class" into nougat-cts-dev