Merge "Jarjar all classes in service-connectivity"