Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev
am: c119a677c4

Change-Id: I7f1a7c5d09d38cfbd3fca0ee158f6401233e8f6d