Merge "Catch unbinding errors" into oc-mr1-dev
am: ebd047e92f

Change-Id: Ifd29c608bb23afb5ed630d9fc57d40f41b7d0921