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

This reverts commit 5d476972b680fa794774b6b7263b824b1f906672.
Rebase from 'upstream'
Trimmed the branch to only the navigation_layers sub directory