Merge "Skip STATE_SERVICE_RESTARTING while dumping procstats to statsd" into sc-dev