Merge "Revert "Revert "Revert "nfc: reflect style guide."""" am: 13e19421b3 am: 56fb3ee908 am: d0b8606d27
am: 9e052ff786

Change-Id: I402dd944ab1c620a35075da8681ca277ad5efbbf