Merge "Sonar Fix: MiscID.java"