Merge "Remove ComputerTracker and fix consistency in PackageManagerService" into tm-dev