Merge "Update metrics_constants from settings" into nyc-dev
am: ba6a761c09

* commit 'ba6a761c09f8881e4e4bca70f3397f321b5fa031':
  Update metrics_constants from settings