[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1  -s ours
am: 7f84596929  -s ours

Change-Id: Ia1485d87e224d8fb870b50bc73f4ee6e93dd48e4