Merge "Simplify removing a bond"
am: 42239d8766

Change-Id: Id99420bb7ab1ddd74dad675923a01da3c94b2476