Merge "Remove redundant TODOs from PackageTracker" am: 01d686b85e am: b65356709e
am: 452dcfce41

Change-Id: I699962dee85ff318433004cd91f183c0630e3888