Merge "Fix apex_available on service-connectivity" into sc-dev