am d9621f86: Merge "Make download manager tests more reliable." into jb-mr2-dev

* commit 'd9621f867027dedc47df50c8ff4bf6f67c188ea4':
  Make download manager tests more reliable.