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

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