Increase timeout for savanna tests

Change-Id: I379f0d2d9e96ac28473f4dc242600dd0755fe366
Merge "Increase timeout for savanna tests" into 3.2-fixes