Merge "Admin.java: Fixed sonar issues"