Merge "Enforce permission when disabling API checks." into pi-dev