Merge "Always throw a ConnectionException on error" into oc-dev
am: 1c7445565d

Change-Id: Ib80975794f05d97aec6c3bdc3639d113a7085f90