Merge "Treat missing package usage data as a separate case"