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

Change-Id: I69534699a9bc398f25b0f64bc7c8c6ff95fd0ca2