Merge "Use production ID for v2 signing scheme." into nyc-dev