Merge "Update VolumeProvider reference to fix build" into lmp-dev