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

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