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

Change-Id: Ic15f55198b6672f1349690a59182dfee067c00c6