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

Change-Id: Ied3e488c357ce30206aa80179a8d204204ff07a4