Merge "NFC antenna location asset." into nyc-dev