diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
index bb030f241fef..ede6b8f953e5 100644
--- a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
+++ b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
@@ -34,8 +34,9 @@ ForwardPortWithAdb (uint16_t port, std::string& device_id)
     if (error.Fail ())
         return error;
 
+    device_id = adb.GetDeviceID ();
     if (log)
-        log->Printf("Connected to Android device \"%s\"", adb.GetDeviceID ().c_str ());
+        log->Printf("Connected to Android device \"%s\"", device_id.c_str ());
 
     return adb.SetPortForwarding (port);
 }