Drop mdsal-sonar to 4c-4g