Merge "Fix null ref exception in DirCacheCheckout"