Merge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
am: c738e48ed6

Change-Id: Iae1170534a10b81778e9e1cd3df8e5fca62f7546