[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 am: ed82c6fac8 am: c1f8a09c1e am: 8091a00994  -s ours am: bc12dda3a7 am: ffe6090f7e am: a71d1c416b
am: 081bea189d  -s ours

Change-Id: Ic3f72935e96e7b6f7b3a69474451d3edd418dd24