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

Change-Id: I2eed24b14da4c2b6df4bc766aaf86fb08100cd90