Merge "Enable hidden API enforcement"