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

Change-Id: I9a3d80f111301445925a550f224d8fa0f843a9fb