Option to enable/disable pie (2/2)

Change-Id: Icb9736ac0390c804399097ab53524f4e6f2a463d