Merge "Revert "Revert "More flexible API enforcement policy."""