Merge "NFC antenna location asset." into nyc-dev am: 262a8f2a0f
am: 1847a6c406

* commit '1847a6c406186246b275e7a6b6f05dcebaf2cbdd':
  NFC antenna location asset.