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

Change-Id: I5717c67a7714393e24ea2e8784cbc084ced31b5e