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

* commit '6a4e1923005b12e8375c24775f8089a94a08a2e6':
  Centralize EnterprisePolicyGuard checking code in CP2.