Merge "Return error when trying to disconnect twice" into oc-dev
am: fc333972e9

Change-Id: Ief6294b415385e1cf584f1d54cf605c78717c43d