Merge \\"Extract public key ID from cert\\" am: 606ad22def
am: 45373976b1

Change-Id: I2d1d174d25aee419cd666ad9a69a8a590645af42