Merge "Remove ConnectivityService hidden annotations"