Merge "Prevent Closure of Underlying Socket FDs"