Merge "Fix bonded address been removed unexpected"
am: 6fa5181d8f

Change-Id: Ic391f1b00dc3e6b053ebd9390c578a033885885c