Fixing style issues.

Change-Id: I9c8f3eb9974f7210d4f7d5b45204838c044c2e0c