Merge "Support getting public key data"
am: 66e76443a0

Change-Id: I0e20abf7b46b51aac02fff6cb4eab7e039cbd7a2