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

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