Merge "Remove ConnectivityService hidden annotations" into sc-dev