Merge "Set up a test for hidden API enforcement"