Merge "Remove redundant TODOs from PackageTracker" into oc-mr1-dev