Merge "Statsd BroadcastSubscribers can receive 'cookies'" into pi-dev
am: 81cacb274c

Change-Id: I4a74e97d84db573c98d4fbb3645ad0662c153aea