am d6ee5033: Merge "Make apps able to run with a failing patchoat" into lmp-dev

* commit 'd6ee5033433619a893a8f20319efcf8c8b1d1016':
  Make apps able to run with a failing patchoat