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

Change-Id: I391a070bc028de13702fb8c5ba63150b3926e303