Merge "Use the new NetworkScore API to send scores" into sc-dev