Merge "Make network clients use rest_client"