Style changes

Change-Id: I92ccb4ff702e3d85aa4a248f4185a67973f8cbea