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

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