nfc: reflect style guide.
am: e0c416a6f2

Change-Id: I931b59e9ed4d017ba09f8d82c4de87f39b0fc9e7