Merge "Replace user with debuggable check in ConnectivityService"