Merge "Start retiring socket_loopback_client." am: 58f7f61266 am: cd0e8cfd33 am: aa509a3e9d
am: fc485e4488

Change-Id: I1ae7d60ab350cf653b27ea220318159eca4f5a0a