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

Change-Id: I8fa19741bded56170cca7e5bc74959eeaaa67455