Merge "Fix error response handling for RIL request"