Merge "Replace some PackageInfo queries with PackageState"