Merge "Update certs for pmmapper in Bulkpm usecase"