Re-astyle

Change-Id: Iacfed5764164c80130685cac757f1b9ca0acfdaf