Fix and Track Halo build now Fixed

Change-Id: I2ba11ac31f62a4c9b4d27ce554a627501efbbca7