Merge "Renumber UMA constants." into nyc-dev