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

Change-Id: Iacf9f43f88ac77cb2a6094348cf52107f7ef0817