Merge "Fix lint failures in cache warming."