Conditionally set enablement of all Pie options correctly

Change-Id: I28d766c819fe3d83ce4241a879c9d293d1f58854