diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index afd133a..b0d3c28 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc

@@ -174,6 +174,7 @@
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/switches.h"
 #include "ui/latency/latency_info.h"
 #include "url/origin.h"
 #include "url/url_constants.h"
@@ -2523,6 +2524,13 @@
 
 void RenderViewImpl::SetDeviceColorProfileForTesting(
     const gfx::ICCProfile& icc_profile) {
+  // TODO(ccameron): Remove this call when color correct rendering is the
+  // default.
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableColorCorrectRendering)) {
+    return;
+  }
+
   if (webview())
     webview()->SetDeviceColorProfile(icc_profile);
 

diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index 59ced11..e98bd852 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc

@@ -218,8 +218,12 @@
     // other platforms).
     if (!command_line.HasSwitch(switches::kForceColorProfile)) {
 #if defined(OS_MACOSX)
-      command_line.AppendSwitchASCII(switches::kForceColorProfile,
-                                     "generic-rgb");
+      if (command_line.HasSwitch(switches::kEnableColorCorrectRendering)) {
+        command_line.AppendSwitchASCII(switches::kForceColorProfile, "srgb");
+      } else {
+        command_line.AppendSwitchASCII(switches::kForceColorProfile,
+                                       "generic-rgb");
+      }
 #else
       command_line.AppendSwitchASCII(switches::kForceColorProfile, "srgb");
 #endif

diff --git a/tools/perf/page_sets/system_health/browsing_stories.py b/tools/perf/page_sets/system_health/browsing_stories.py
index 4947859..f5d1a590 100644
--- a/tools/perf/page_sets/system_health/browsing_stories.py
+++ b/tools/perf/page_sets/system_health/browsing_stories.py

@@ -10,6 +10,7 @@
 from page_sets.login_helpers import facebook_login
 from page_sets.login_helpers import pinterest_login
 
+from telemetry.core import exceptions
 from telemetry.util import js_template
 
 
@@ -825,7 +826,8 @@
         # Scrolling is stuck. This can happen if the page is loading
         # resources. Give the page some time and retry scrolling.
         if retry_count == self.MAX_SCROLL_RETRIES:
-          raise Exception('Scrolling stuck at %d' % remaining)
+          raise exceptions.StoryActionError(
+              'Scrolling stuck at %d' % remaining)
         retry_count += 1
         action_runner.Wait(self.TIME_BEFORE_SCROLL_RETRY_IN_SECONDS)
       else: