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

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