Update NFC values

Change-Id: I1934ba99c4ce32983007cc21ba640994f705fbce