Merge "Fix transitioning between non-accept strict policies." into oc-mr1-dev