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

This reverts commit 9aefad0db3247b72ce3339f43788caf3a3dbd86d.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the voxel_grid sub directory