enable enhanced nfc

Change-Id: Ib4871420b31106244fda5eb6d01d3caa3d26f112