Re-astyle

Change-Id: Ic84f176d190362364a3f6d13a811df3447fa32e6