halo, tweaking

Change-Id: I35f8dc19ed5840e186989ec3cfa5529c9d39dd48
(cherry picked from commit 5b57414a42da30a2d74b7e7dc5840fe03aa5a5c5)