Merge "Increase kDumpWaitTimeout 10x for target builds"