Merge "Keymint: Add CERTIFICATE_* tags"