nfc: update default implementation to match style. am: a74426d691
am: 3447c4687a

Change-Id: I2dc2c9e51dd83378b8176c8823b1dba83b79d990