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