Make it possible to include public key metadata.
am: 18666abc5d

Change-Id: Ia6a69ce521b8a5b58610d4ae3cbfe62596725c98