Port HALO from UKG (2/2)

Change-Id: I3290905dc1285bbe487f371a9e95595db0516efd