Merge "Use GetPeerFromOtherThread in debugger."
am: 2cd5ae93a3

Change-Id: I9d8309c7b25f5c572b3faadf83ede6433a1f774c