nfc: update default implementation to match style. am: 6b6381cb58
am: 36108aadd4

Change-Id: Iac25d37c46c04aa18357c77ace08c810f67ccf72