Merge "Adjusted fix for crashes from empty cache_warming_hosts with tests."