Merge "Add vendor-logged stats to statsd." into pi-dev