Merge cherrypicks of ['android-review.googlesource.com/2927031'] into emu-34-release.emu-34-release

Change-Id: Ice92924589195bc1edd40b86adfde1b6a9918d33

1 files changed, 4 insertions, 2 deletions

diff --git a/host/commands/modem_simulator/nvram_config.cpp b/host/commands/modem_simulator/nvram_config.cpp
index ad06f9427..22b337329 100644
--- a/host/commands/modem_simulator/nvram_config.cpp
+++ b/host/commands/modem_simulator/nvram_config.cpp
@@ -56,8 +56,10 @@ NvramConfig* NvramConfig::BuildConfigImpl(size_t num_instances, int sim_type) {
     } else {
       auto loaded = ret->LoadFromFile(nvram_config_path.c_str());
       if (!loaded) {
-        delete ret;
-        return nullptr;
+        /** Bug: (b/315167296)
+         * Fall back to default nvram config if LoadFromFile fails.
+         */
+        ret->InitDefaultNvramConfig();
       }
     }
   }