Merge "Multiple Sonar Fixes - MiscID.java"