am 9a91bf1d: am 96f47f5b: am b0197033: Increase timeout when uncrypting OTA
automerge: 26eaaee

* commit '26eaaeed3dcc0e9010057c7a1cbf177c998c368e':
  Increase timeout when uncrypting OTA