Merge "Add a DCHECK in thread::GetPeer." am: 8dc12b1546
am: 531fa63350

Change-Id: I31bb62549868e299736f6c0b38a1226a6e9d5d3e