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

Change-Id: I908b1061f22d39c3d1354aafb52133f175c78b41