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

Change-Id: Ia41c67b41b9b89ac113f01e783edcbccae5a1cdc