Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev