Port HALO from UKG (2/2)

Change-Id: I3290905dc1285bbe487f371a9e95595db0516efd
HALO bug fixes

Change-Id: I7dfee00d3ce531d0b7d901c82a28f8a44f842c4c