Merge "Apply requirements when enabling provider"