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

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