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

Change-Id: Ia3922aa0afdae29050bc7a73c0bdbca50039044f