Merge "Merge "Move new RetryFilterHelper() to a method" into oreo-cts-dev am: 145ff5af54"