Merge "Cleanup of Cellular/Wifi aggregate statistics" into oc-mr1-dev