halo changes, which i can't remeber...

Change-Id: I0cbf805f33a43e934a334d1bb9b92359740fcf76