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

Change-Id: Id44b3d7226ebe9f18ba39ec3d35c8914be8ade14