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

This reverts commit 733396a9896f670c77b48aa9c0170b74a6d1b75f.
Rebase from 'upstream'
Trimmed the branch to only the ndt_map_builder sub directory