Merge "Clean up enterprise uri related code in CP2" into nyc-dev am: 6fac54d637
am: fe7b1fb6da

* commit 'fe7b1fb6da5d05c559ccfbc818cba959d263fe7f':
  Clean up enterprise uri related code in CP2