Merge "Sonar Fix: AuthUtil.java"