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

Change-Id: Ie907bff58e2a8d92e825a6f95bdaf411ab48f2ff