am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout...
am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev
* commit '00db0826':
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."