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

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