c8817d: update for NFC

Change-Id: I96b1270f6c19c208c58144297702b6655ef39034