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

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