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