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

Change-Id: Iaf9a202979335c18b2c55c27530ef84e129ccf76