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

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