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

Change-Id: I878e8bf78e83e93a2e80b3485676553b94026612