These files had a consistent style previously, keep them that way.

Change-Id: I6347efd4a301ddd758f4661778c0dfb68585940d