Merge "Fix comments in rest_client"