Merge "Sonar fix: ListForCreds.java"