(Workinprogress) Icehouse release megapatch

All the things.

Change-Id: I9576fcb221655e94a67893f6a928c165915159a1