Merge "DR_SUB.java: Fixed sonar issues"