Merge "Fixed major sonar issue in ApiPerms.java"