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

Change-Id: Ie097fa356779fd9333d85788890c8c96cbd35865