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

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