Merge "rebind if the connection drops" into oc-dev
am: dff13a0bb1

Change-Id: I4cb5542b28829d9f8dfe6989d37610c733a6457b