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

This reverts commit 1f857d54934ae0c1fe31a2cbf57baf05253c68cc.
Rebase from 'upstream'
Trimmed the branch to only the controller_interface sub directory