Merge "API council requested tweaks to TrafficStats." into pi-dev