Merge \\\"Extract public key ID from cert\\\" am: 606ad22def am: 45373976b1
am: c493619938  -s ours

Change-Id: I67700423a0ea58410c774a324f4f5a78a4b7d59e