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