Merge "API council requested tweaks to TrafficStats." into pi-dev am: 9a6bc76ee8
am: efae42a25d

Change-Id: I65c961a839a3b7404f753d3278c70bc50f918b7f