Fix "Halo: Modify behavior"

I forgot about halo blacklist / whitelist feature.

and some cleanup.

Change-Id: I4350478ec17f1d8636e265235743d4f45f4f0f76