Merge commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb' into eclair-mr2-plus-aosp * commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb': Migration to TrafficStats.
Merge commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb' into eclair-mr2-plus-aosp * commit '1270e2e22b0b3f0705cee2b82788d8dc3fb03cdb': Migration to TrafficStats.