Style violation cleanup.

Change-Id: Idb127f2fd6e637039454f47299360aec5a4edfe8
16 files changed