Merge "Add getter for X509 certificate" am: 38c9e614af
am: 8547723200

Change-Id: I00df28d905614dc35c67345954b3e6ecc5c59643