Merge "Increase DumpstateBoard timeout to 30s" into pi-dev
am: 9ed310e50f

Change-Id: I2478fb5e7443b46beeb9111adc667693ad521c7c