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

Change-Id: I10b9dbaf5b864c20bd02ac810cb9ca5bcc4f6bd6