Merge derp (pie controller)

Change-Id: Iad5c38c0684796dd3d5ee90b91cdbd3302c6bbee