[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9  -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157  -s ours
am: 1448a693d8

Change-Id: I8693bc42cd9ff46f6b0c56db49a5c467b3ab4af0