am 3957ae73: Merge "recovery: enable permissive_or_unconfined"

* commit '3957ae733f1066efa5d0ae2b03604c0b11549430':
  recovery: enable permissive_or_unconfined