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

This reverts commit 8f91da0c7ca966884a4b5ab6b7c53c6b929528c0.
Rebase from 'upstream'
Trimmed the branch to only the network_traffic_control sub directory