Merge "Create service-connectivity.jar"