Merge "Fix transitioning between non-accept strict policies."