Merge "Add enforcement parameter to RequiresFeature"