Re-astyle

Change-Id: I07970ababe907fff2595f605abebb91fbd10db85