Merge "Remove redundant TODOs from PackageTracker"