Merge "Centralize EnterprisePolicyGuard checking code in CP2." into nyc-dev