Merge "Increase kDumpWaitTimeout 10x for target builds" am: 35e0cbce51
am: bde4b53454

* commit 'bde4b5345452ce473597df3a98b8f6ae10945f34':
  Increase kDumpWaitTimeout 10x for target builds