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

Change-Id: I3ab796cc17d5ee2e4a2c8838bac2ada4831c755f