Merge "Remove services.net JAR dependency"