Merge "Make sure to handle new RpcSession::FileDescriptorTransportMode"