Fix for bonding tests

Change-Id: Iac5f02569f6d934659d3907811e7aadada357f85
Closes-Bug: #1323261
Merge "Fix for bonding tests"