Add Halo (2/2)

Change-Id: I5f4c3b9032d1bf21cb62bd98e5b9ec2156b2a631
Add Halo (2/2)

Change-Id: I5f4c3b9032d1bf21cb62bd98e5b9ec2156b2a631