Merge "Revert "Revert "Revert "nfc: reflect style guide.""""
am: 13e19421b3

Change-Id: I32627c1cadf883d5db0649bca3f8974388cd64ad