Merge "Updating proto enums." into sc-dev