Merge change I96ddd6e2 into eclair-mr2

* changes:
  Migration to TrafficStats.