Merge "Sonar Fix: List.java"