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

This reverts commit d37d8ebecdd854dc572a9a292c370f18b1375b3d.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the navigation_layers sub directory