Merge "adding packet count and removing extra uid stats that were used for debugging."