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

Change-Id: I9590aa505b63f0f9e20ad188f74a54906f58b1e4