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

Change-Id: Id599274866a7686fa49f377c2911b6fba64201f5