Fix style issues.

Change-Id: I646b5232cfac772c5a310b62f435a2cc79b2c831
5 files changed