Merge "Allow unit tests to use hidden connectivity APIs" into sc-dev