Merge "Integrate upstream changes in ServerSocket from 8u121-b13"