Merge "[DCAE] Use global storage templates for PVC"