Merge "Sonar issue-fix -- (ExternalAppConfig.java)"