Fix for bonding tests

This reverts commit 374afb050c1be0a9dbc37513fee8dc1624ca2e85.

Change-Id: I065d62c23e739178495106774aa5ce99c0796ff9
Merge "Fix for bonding tests"