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

Change-Id: Ia0a54bdbc11fee2f39a851546fde191055b55c3f