[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 am: 3d4c737736
am: f6d8037708

Change-Id: Iec857815b52d8b0bdfdd1b14210fa67bc3a17c83