Merge "MusicHealthCheck.java - Multiple Sonar Fixes"