Merge "Non-functional code cleanup of ConnectivityService." into m-wireless-dev