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

This reverts commit 09293007ec79459105c3a274305041116f0dfeec.
Rebase from 'upstream'
Trimmed the branch to only the nav_goals_generator sub directory