Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694 am: 8fd324c3 am: 438cc52c  -s ours am: 7f845969  -s ours am: ed82c6fa am: c1f8a09c am: 8091a009  -s ours am: bc12dda3 am: ffe6090f am: a71d1c41 am: 081bea18  -s ours am: 34b14060 am: 45c45d35 am: dc9c76c3 am: 602e5dda" into nyc-mr1-dev-plus-aosp
am: 1a2973ba  -s ours

Change-Id: I763574f269fd527ac6e6ce6cc798d1e7d49a216d