Merge "AppMessages.java - Sonar Fixes"