Merge "Centralize EnterprisePolicyGuard checking code in CP2." into nyc-dev am: 6a4e192300
am: 2fe2f5ab6e

* commit '2fe2f5ab6e00e0452c6f7d973c6478c7a52e4855':
  Centralize EnterprisePolicyGuard checking code in CP2.