Merge "Remove SocketTimeoutException custom constructors"
am: fe7ce53ee2

Change-Id: I22d73b2e6713487d16d848c705bcd4f95b04903a