[polymer] Merge of master into polymer10-migration

telemetry/telemetry/value/list_of_scalar_values.py

Index: telemetry/telemetry/value/list_of_scalar_values.py
diff --git a/telemetry/telemetry/value/list_of_scalar_values.py b/telemetry/telemetry/value/list_of_scalar_values.py
index 3957067a875f2f5bdce204c59a6314bed711faea..f5d04f419b10261d1493f563bbb8afa5a28ffecf 100644
--- a/telemetry/telemetry/value/list_of_scalar_values.py
+++ b/telemetry/telemetry/value/list_of_scalar_values.py
@@ -73,8 +73,7 @@ class ListOfScalarValues(summarizable.SummarizableValue):
   def __init__(self, page, name, units, values,
                important=True, description=None,
                tir_label=None, none_value_reason=None,
-               std=None, same_page_merge_policy=value_module.CONCATENATE,
-               improvement_direction=None, grouping_keys=None):
+               std=None, improvement_direction=None, grouping_keys=None):
     super(ListOfScalarValues, self).__init__(page, name, units, important,
                                              description, tir_label,
                                              improvement_direction,
@@ -89,7 +88,6 @@ class ListOfScalarValues(summarizable.SummarizableValue):
     none_values.ValidateNoneValueReason(values, none_value_reason)
     self.values = values
     self.none_value_reason = none_value_reason
-    self.same_page_merge_policy = same_page_merge_policy
     if values is not None and std is None:
       std = StandardDeviation(values)
     assert std is None or std >= 0, (
@@ -109,14 +107,9 @@ class ListOfScalarValues(summarizable.SummarizableValue):
       page_name = self.page.display_name
     else:
       page_name = 'None'
-    if self.same_page_merge_policy == value_module.CONCATENATE:
-      merge_policy = 'CONCATENATE'
-    else:
-      merge_policy = 'PICK_FIRST'
     return ('ListOfScalarValues(%s, %s, %s, %s, '
             'important=%s, description=%s, tir_label=%s, std=%s, '
-            'same_page_merge_policy=%s, improvement_direction=%s, '
-            'grouping_keys=%s)') % (
+            'improvement_direction=%s, grouping_keys=%s)') % (
                 page_name,
                 self.name,
                 self.units,
@@ -125,7 +118,6 @@ class ListOfScalarValues(summarizable.SummarizableValue):
                 self.description,
                 self.tir_label,
                 self.std,
-                merge_policy,
                 self.improvement_direction,
                 self.grouping_keys)
 
@@ -143,10 +135,6 @@ class ListOfScalarValues(summarizable.SummarizableValue):
   def GetRepresentativeString(self):
     return repr(self.values)
 
-  def IsMergableWith(self, that):
-    return (super(ListOfScalarValues, self).IsMergableWith(that) and
-            self.same_page_merge_policy == that.same_page_merge_policy)
-
   @staticmethod
   def GetJSONTypeName():
     return 'list_of_scalar_values'
@@ -179,17 +167,6 @@ class ListOfScalarValues(summarizable.SummarizableValue):
     assert len(values) > 0
     v0 = values[0]
 
-    if v0.same_page_merge_policy == value_module.PICK_FIRST:
-      return ListOfScalarValues(
-          v0.page, v0.name, v0.units,
-          values[0].values,
-          important=v0.important,
-          same_page_merge_policy=v0.same_page_merge_policy,
-          none_value_reason=v0.none_value_reason,
-          improvement_direction=v0.improvement_direction,
-          grouping_keys=v0.grouping_keys)
-
-    assert v0.same_page_merge_policy == value_module.CONCATENATE
     return cls._MergeLikeValues(values, v0.page, v0.name, v0.tir_label,
                                 v0.grouping_keys)
 
@@ -210,7 +187,9 @@ class ListOfScalarValues(summarizable.SummarizableValue):
     for v in values:
       if v.values is None:
         merged_values = None
-        none_value_reason = none_values.MERGE_FAILURE_REASON
+        merged_none_values = [v for v in values if v.values is None]
+        none_value_reason = (none_values.MERGE_FAILURE_REASON +
+            ' None values: %s' % repr(merged_none_values))
         break
       merged_values.extend(v.values)
       list_of_samples.append(v.values)
@@ -226,7 +205,6 @@ class ListOfScalarValues(summarizable.SummarizableValue):
         important=v0.important,
         description=v0.description,
         tir_label=tir_label,
-        same_page_merge_policy=v0.same_page_merge_policy,
         std=pooled_std,
         none_value_reason=none_value_reason,
         improvement_direction=v0.improvement_direction,