Merge "Create a service-connectivity-pre-jarjar library" into sc-dev