Update style issues.

Change-Id: If89ce9a6bb0e0f26bb58d50fe6b8163e8f178b09