Merge "Test for hidden api enforcement killswitch" into pi-dev