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

Change-Id: I944a6cf7c8daeb214c1478b11561d6178a9a9c2b