Style fix

Change-Id: I03d2d1f71b29b7787dc13a43d2af88a2e888c27f
Merge "Style fix"