Merge "Fix credential client to return raw response"