Merge "Update Verzon eri_311480.xml to v7." into oc-dr1-dev