Merge "Fix RootsCache invalidation bugs." into nyc-dev