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