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

Change-Id: I9e73b1c966ca614550165c833df5b3a8e8627496