Merge "Sonar Issues for ExternalAppConfig.java"