Merge "Prevent SocketTest off-thread Exception from escaping" am: 6ad1e2b8fd am: 7006f185d3
am: aa4af0588a

Change-Id: Id9cd4ca1043caca9f62b0e9e9ef714187071dbf3