Merge "Sonar Fix: Clear.java"