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

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