Merge "Revert "nfc: reflect style guide."" am: ea4b569fee am: a2bdc9d012 am: 99af2885ee
am: fdff6ba374

Change-Id: I7ac7d469afdb944e8b8b49789e4557e43a1918fe