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

Change-Id: I21ca644adfce6f1d0328f161d435740c623b7ddd