eri: update from shamu
vs980: More VZW prop changes

Change-Id: I024fe11ee8e9028c493ec2e0582135199177427e
vs980: Update some props