Merge "Statsd BroadcastSubscribers can receive 'cookies'" into pi-dev