Revert "Revert "nfc: reflect style guide."" am: 106bc9d27a am: 22fa3244c7
am: afc722acbe

Change-Id: Iba48516670b8a996d7f30d26c7903a2638bf7620