Fix vzw nfc

Change-Id: Iac0d7fc17d539765788ecf5da4d1e03d0d061f23