Merge "Increase a timeout that's too short"
tree: 913d908a31ef94f614e38fe39ff59f20e7e98765
  1. tests/