Merge "Fix recovery: don't assert if there's no tzdata."