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

Change-Id: Idf5835f2c43b560a6ac20a2723b1a86b76213a0a