Merge "dumpstate: Increase timeout for lshal"