Merge "Update Verzon eri_311480.xml to v7." into oc-dr1-dev
am: 1230d603b1

Change-Id: I29b7955f29a0516f9fd18344a80a9fd169f8cd85