Merge "Remove redundant TODOs from PackageTracker"
am: 01d686b85e

Change-Id: If74fa1bcd6be188079de231e7903795ea7d0b5be