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

Change-Id: I66bd7b3efb98625dee00dbd5f3866d8f3fa5b960