Revert "Trimmed the branch to only the network_control_tests sub directory"

This reverts commit a877a84efc43a6fd404614920ff74d8e90f0f617.
Rebase from 'upstream'
Trimmed the branch to only the network_control_tests sub directory