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

This reverts commit 607239c8ac2243e8095ed518126e79655bdc42fa.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the controller_manager_tests sub directory