Merge "Keymint: Add CERTIFICATE_* tags required for certificate generation."