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

Change-Id: I9d5784d4fa65279af2ab77fbf93576884258b1b3