Merge "Remove socket_loopback_client." am: 5171bebf41 am: 091113ec6c
am: 232a19495b

Change-Id: I6dd6b5fe4a313fc4f0ee6fd786032cb69e3e2562