Revert "nfc: reflect style guide." am: 69bb15e06e
am: 523f7fc318

Change-Id: Ic87635f8f4136f9384a0486267bbccc1c1afd5f1