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

This reverts commit 31034276686bd4fd5eb2800e8367b10def08a200.
Rebase from 'upstream'
Trimmed the branch to only the voxel_grid sub directory