diff --git a/profile.cc b/profile.cc
index b28fbb3..911be12 100644
--- a/profile.cc
+++ b/profile.cc
@@ -24,6 +24,7 @@
 #include "shill/property_accessor.h"
 #include "shill/service.h"
 #include "shill/store_interface.h"
+#include "shill/stub_storage.h"
 
 using base::FilePath;
 using std::set;
@@ -94,7 +95,7 @@
         base::StringPrintf("Could not open profile storage for %s:%s",
                            name_.user.c_str(), name_.identifier.c_str()));
     if (already_exists) {
-      // The profile contents is corrupt, or we do not have access to
+      // The profile contents are corrupt, or we do not have access to
       // this file.  Move this file out of the way so a future open attempt
       // will succeed, assuming the failure reason was the former.
       storage->MarkAsCorrupted();
@@ -115,6 +116,10 @@
   return true;
 }
 
+void Profile::InitStubStorage() {
+  set_storage(new StubStorage());
+}
+
 bool Profile::RemoveStorage(GLib *glib, Error *error) {
   FilePath path;