Merge "Update metrics_constants from settings" into nyc-dev