Merge "Merge "Clarify which methods return connected sockets" am: bce398bfd3 am: a618570424 am: be6676d6c3 am: 2e966dce50"