Merge "Add a 10s timeout to DumpstateBoard" into pi-dev am: 8f5982fddb
am: 752dcf7824

Change-Id: Id31efd2a62a16ecff0bf8be35cdcadb045bcca21