Squashed revert of AppOps until gapps SetupWizard doesn't explode