Merge "Fixed sonar issue in ApprovalSet.java"