Merge "Volume policy updates."