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

Change-Id: If603d5c8f73d69ef50617a0ee25721468c136630