Merge "Use GetPeerFromOtherThread in debugger." am: 2cd5ae93a3 am: 927195dd8a
am: a15b891039

Change-Id: Ibc213e8c5b6d0014e19f21ff4326cc51a60df72b