Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4 am: c5a17fc39f am: 18f9533910
am: 40d926f4d4

Change-Id: I9d36d715d049d00a176175cebf02c8a8fed0a7b3