[polymer] Merge of master into polymer10-migration

telemetry/telemetry/value/scalar_unittest.py

Index: telemetry/telemetry/value/scalar_unittest.py
diff --git a/telemetry/telemetry/value/scalar_unittest.py b/telemetry/telemetry/value/scalar_unittest.py
index 135a3358984decef3eea019b1694ad2f2d87a7ec..a37d5d4dfc43f5b5b8ee409f86a963fcd06d6397 100644
--- a/telemetry/telemetry/value/scalar_unittest.py
+++ b/telemetry/telemetry/value/scalar_unittest.py
@@ -104,8 +104,12 @@ class ValueTest(TestBase):
 
     vM = scalar.ScalarValue.MergeLikeValuesFromSamePage([v0, v1])
     self.assertEquals(None, vM.values)
-    self.assertEquals(none_values.MERGE_FAILURE_REASON,
-                      vM.none_value_reason)
+    expected_none_value_reason = (
+        'Merging values containing a None value results in a None value. '
+        'None values: [ScalarValue(http://www.bar.com/, x, unit, None, '
+        'important=True, description=None, tir_label=None, '
+        'improvement_direction=down, grouping_keys={}]')
+    self.assertEquals(expected_none_value_reason, vM.none_value_reason)
 
   def testScalarWithNoneValueMustHaveNoneReason(self):
     page0 = self.pages[0]