Merge "Change two-value client methods to use ResponseBodyData"