Merge "Add shard ID to statsd atom for procstats collection" into rvc-dev