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

Change-Id: I479fb0d4770a1163b7d4671caa6bb8f705a1b407