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

This reverts commit 0faafc13e978dfa50e2e99c18e373b1dc14fd697.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the controller_interface sub directory