am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev
automerge: 8deabad

* commit '8deabad541984571496456646d6a7a91eccc9e42':
  Increase timeout when uncrypting OTA