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

Change-Id: Ic14d486ddd9f7ca2c5b31a79c48a88e0021bfd27