Merge "1. Enable FIELD_TYPE IDs defined in ProtoOutputStream 2. Migrate CountMetricProducer to use ProtoOutputStream"