Port HALO from UKG (1/2)

PS2: Remove whitespaces

Change-Id: Icb694ee722564d4939a7874b9bd515bdac05490c