Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev