Merge "Use metrics defined by proto in new Settings tabs." into nyc-mr1-dev