Merge "Fix RootsCache invalidation bugs." into nyc-dev am: 09d7741
am: 812dfdd

* commit '812dfdd88d77601ed60a77f9c9d2f4a5f1b34d1c':
  Fix RootsCache invalidation bugs.

Change-Id: I593a3c5f76d4fb5d46217b82a87aa91b3f7bf5d9