Merge "Revert "Remove framework-connectivity from the private API"" into sc-dev