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

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