Merge "Clean up enterprise uri related code in CP2" into nyc-dev