am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreloadHolder""

* commit '0ced44f2869c61a7f2ba20c115416582b2740be5':
  Revert "Put the CertBlacklist in a NoPreloadHolder"