Merge "Sonar fix: List.java"