Global code reformat

Change-Id: I4b3c74ede518aa2712038d1451974a93cdecabc2