Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are...
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: 0641d0f6
am: d889c8e7
Change-Id: I0417ea58275604b9ac1fca6e79c14697d965397a