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

This reverts commit 17d415e67c42f67860173c5361ecacb99aed3396.
Rebase from 'upstream'
Trimmed the branch to only the grizzly_navigation sub directory