Merge "JsonNotification.java: Fixed sonar issue"