Merge "File needed for using the new X509v3 cert API" am: eebc649f31
am: 57ca6b5946

Change-Id: Iaf832c94957b9296c39e78bf4fbca64c5f80e82a