Merge "Consistent naming for PackageManager methods."