Merge "Fixes Value metrics in statsd and app upgrades." into pi-dev am: c9076fac9b
am: fcac66945b

Change-Id: I69ec35986b48e33b61a93dca78b0aa4dff2a9ce8