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

Change-Id: Ib49018d96a66694da97c5f10d587aab782c33d51