Keys and NFC checker update

Change-Id: I77ddaee79579609c9be30fe18e55795dae3784ed