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

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