Merge "Fixed sonar issue in AppMessages.java"