Merge "Update VolumeManager to use UnmountTreeWithPrefix."