Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4
am: c5a17fc39f

Change-Id: Ie634af4f18044ffaf98c21149c1635b6ad8b9a3f