Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain"