Merge "Fix transitioning between non-accept strict policies." am: bef2c91bb5 am: 345a2f98a1
am: dc46874c51

Change-Id: I46ee39bcf10e54f29ac65ad744dde7d399bec522