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

Change-Id: I4ca18b428d40363176a71fd9b0a3916e5dd07bb2