Pie: merge

Change-Id: I6e4bf39bb68d79986062e1013d7d8f08f9ffe6f2
HALO: support (2/2)

Change-Id: I03cd7cdea21ba5900783b3a906667fcfc749222f

halo fix

Change-Id: I8ebf9e0f630f60b215cd4b8a1ad01b0f72c6172f

merge Finished

Change-Id: Ib1ade618e23ff2fbc749fdbe326642a6b20ec305