Merge "Remove manifest references to deleted providers." into main