Merge "Clean up user version constants"