Merge "More progress on triaging PackageManager callers."