Merge "Prevent Closure of Underlying Socket FDs"
am: 3cff120fcb

Change-Id: I2f8e445f9a12e95cf8d81d63e02fad7ecc17ad36