Squash update : HALO and PIE from Mokee

Change-Id: I8171612413746ce3b6b3ffd0333bbf4f2d10ebb7