Merge "More flexible API enforcement policy."