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

Change-Id: I258b27a87297cae46218991df26f10f91ac5ae12