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

Change-Id: Ib637e1f00ddebbac5a3bea6ff31f08854a95b7ea