Merge "Support getting public key data" am: 66e76443a0 am: b20bf7566c
am: 9bc843973b

Change-Id: I19358df3283e604a8ae9805b02b726545375b409