HALO support (2/2)

Change-Id: I0054e30ef6c05f21c9715e0bb629729905e0519e

fix HALO white list set

Change-Id: I232a8ac45f1607ca47e513ea9111fd163657285a
Merge "HALO support (2/2)" into kk_mkt