Merge "Statsd and frameworks reference proto enums"