Merge "Sonar Fix: NotifyApprovals.java"