Merge "Add frozen counts support in PackageFreezer"