Merge "Sonar Issues for ExternalAppInitializer.java"