Merge 339ca6d55340b8545bd7f160691a36e9a52c194f on remote branch

Change-Id: Ib5837886050c25cce7cd9becc3f34afd3c59f4de
diff --git a/wifi/keystore/1.0/default/keystore.cpp b/wifi/keystore/1.0/default/keystore.cpp
index 411c1a7..467741f 100644
--- a/wifi/keystore/1.0/default/keystore.cpp
+++ b/wifi/keystore/1.0/default/keystore.cpp
@@ -89,7 +89,7 @@
     bssl::UniquePtr<X509> cert(d2i_X509_bio(cert_bio.get(), nullptr));
     if (!cert) {
         LOG(ERROR) << AT << "Could not create cert from BIO";
-        return {};
+        return cert_bytes;
     }
     bssl::UniquePtr<BIO> pem_bio(BIO_new(BIO_s_mem()));
     if (!PEM_write_bio_X509(pem_bio.get(), cert.get())) {