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

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