Merge "SimpleManualPermissionEnforcementDetector: minor cleanup"