Merge "Clean up binding list on error" into oc-mr1-dev am: 563e4982a9
am: 7544eed3ce

Change-Id: I57d06b844fb6aea56fac300d334156daf1dbc7f9