Merge "Sonar Fix: Cmd.java"