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

Change-Id: Ic747a3682d26d285b69ab0bc3677f349ae32a083