Merge "Switch to production constant for v2 signing scheme ID." into nyc-dev