Merge "Load X509 keys from ziparchive" am: a39b2baf12 am: 81ef25aada
am: 93cf8bb309

Change-Id: I4c7a3bb3e71fa987839f8ef74df76a359c8b336d