Re-implement Pie on/off switch (1/2)

Change-Id: I55ce1efa4e002baffafeb26735d6aaae35afaeb3