Merge "Handle renamed packages during default grants"