Merge "Move counter producer off of vendor partition." into main