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

* commit '37fed329adec7b339755fde0b38c687f70524e4e':
  Increase timeout when uncrypting OTA