FW: Port HALO Mods (1/2)

Change-Id: I3591f60e3436c2ac205449d13044bf8c1b65f7a3