Merge "[DO NOT MERGE] Rollup Cert-related changes from R"