Merge "SubjectPublicKeyInfo: use algorithm OID as fallback"