Merge "Enabled aggregated per-uid stats collection by default" into pi-dev