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

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