Merge "Update GenericAtom definition to decouple from metrics_constants proto"