Merge "Fixed sonar issue in Notification.java"