Merge "Slightly relax the timeout condition for testMinimumDownload" into lmp-sprout-dev