Merge "Fixes statsd reports missing strings and SCS." into pi-dev
am: 50a5e71bf3

Change-Id: Icc690ce0a82d07ad46fb95e1a369a037cc9ff9e3