Merge "Update VolumeProvider apis per feedback" into lmp-dev