Pie Control (2/2)

Change-Id: I9d703d132359466c7059d9f92c15e8fb5db230fb