These files had a consistent style before, let's keep them that way.

Change-Id: If64773d8c29dee23638e4fb9b7e5b69b34d47e49