Merge "Separate NegativeRestClient from rest_client"