Merge "Sonar Fix: RetryPolicyStore.java"