Merge "Don't check OverrideAllowedState"