Fix for bonding tests

This reverts commit d5cd1439a382b335ec9f7ac69d2ace78c9c68120.

Change-Id: I161700c8ed8cb0bcbc14832391487404db6bac3f
Merge "Fix for bonding tests" into stable/5.0