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

This reverts commit 91e3abf7d018b3aa38658857f791396ac9ca7fb7.
Rebase from 'upstream'
Trimmed the branch to only the controller_manager_tests sub directory