| Index: tools/android/forwarder2/host_controller.cc | 
| diff --git a/tools/android/forwarder2/host_controller.cc b/tools/android/forwarder2/host_controller.cc | 
| index 0507c114a44deda8396e0cbcd6b2579c35d85b69..98e487ffdbba9c79fb75b427eb0ecbccc981459f 100644 | 
| --- a/tools/android/forwarder2/host_controller.cc | 
| +++ b/tools/android/forwarder2/host_controller.cc | 
| @@ -68,7 +68,9 @@ bool HostController::Connect() { | 
| return false; | 
| } | 
| // Send the command to the device start listening to the "device_forward_port" | 
| -  SendCommand(command::LISTEN, device_port_, &adb_control_socket_); | 
| +  bool send_command_success = SendCommand( | 
| +      command::LISTEN, device_port_, &adb_control_socket_); | 
| +  CHECK(send_command_success); | 
| int device_port_allocated; | 
| command::Type command; | 
| if (!ReadCommand(&adb_control_socket_, &device_port_allocated, &command) || | 
|  |