diff --git a/services/healthreport/Makefile.in b/services/healthreport/Makefile.in
index 1b055979bdae..a8b3b6a30b8f 100644
--- a/services/healthreport/Makefile.in
+++ b/services/healthreport/Makefile.in
@@ -32,12 +32,19 @@ healthreport_depends = \
   providers.jsm \
   $(NULL)
 
+
+ifneq (,$(findstring a,$(GRE_MILESTONE)))
+extra_pp_flags := -DPRERELEASE_BUILD
+endif
+
 MAIN_JS_MODULE := HealthReport.jsm
 MAIN_JS_MODULE_PATH = $(FINAL_TARGET)/modules
+MAIN_JS_MODULE_FLAGS := $(extra_pp_flags)
 PP_TARGETS += MAIN_JS_MODULE
 
 MODULES := $(modules)
 MODULES_PATH = $(FINAL_TARGET)/modules/services/healthreport
+MODULES_FLAGS := $(extra_pp_flags)
 PP_TARGETS += MODULES
 
 TESTING_JS_MODULES := $(addprefix modules-testing/,$(testing_modules))
diff --git a/services/healthreport/healthreporter.jsm b/services/healthreport/healthreporter.jsm
index 1c895fb8a516..966af599b8b3 100644
--- a/services/healthreport/healthreporter.jsm
+++ b/services/healthreport/healthreporter.jsm
@@ -1068,6 +1068,16 @@ HealthReporter.prototype = Object.freeze({
 
     request.onSubmissionSuccess(now);
 
+#ifdef PRERELEASE_BUILD
+    // Intended to be temporary until we a) assess the impact b) bug 846133
+    // deploys more robust storage for state.
+    try {
+      Services.prefs.savePrefFile(null);
+    } catch (ex) {
+      this._log.warn("Error forcing prefs save: " + CommonUtils.exceptionStr(ex));
+    }
+#endif
+
     return promise;
   },