| Index: telemetry/telemetry/web_perf/timeline_based_page_test_unittest.py | 
| diff --git a/telemetry/telemetry/web_perf/timeline_based_page_test_unittest.py b/telemetry/telemetry/web_perf/timeline_based_page_test_unittest.py | 
| index d83643811f1e15fe3611f4d17fff2b6bb651c545..ee6b5ecc74af9c8d4e91bb7cef6ac45452ef87b7 100644 | 
| --- a/telemetry/telemetry/web_perf/timeline_based_page_test_unittest.py | 
| +++ b/telemetry/telemetry/web_perf/timeline_based_page_test_unittest.py | 
| @@ -72,7 +72,8 @@ class TimelineBasedPageTestTest(page_test_test_case.PageTestTestCase): | 
|  | 
| # This test should eventually work on all platforms, but currently this | 
| # this metric is flaky on desktop: crbug.com/453131 | 
| -  @decorators.Enabled('android') | 
| +  # https://github.com/catapult-project/catapult/issues/3099 (Android) | 
| +  @decorators.Disabled('all') | 
| def testGPUTimesTimelineBasedMeasurementForSmoke(self): | 
| ps = self.CreateEmptyPageSet() | 
| ps.AddStory(TestTimelinebasedMeasurementPage( | 
| @@ -95,8 +96,9 @@ class TimelineBasedPageTestTest(page_test_test_case.PageTestTestCase): | 
| self.assertEquals(len(v), 1) | 
| self.assertGreater(v[0].value, 0) | 
|  | 
| +  # android: https://github.com/catapult-project/catapult/issues/3099 | 
| # win: crbug.com/520781, chromeos: crbug.com/483212. | 
| -  @decorators.Disabled('win', 'chromeos') | 
| +  @decorators.Disabled('android', 'win', 'chromeos') | 
| @decorators.Isolated  # Needed because of py_trace_event | 
| def testTimelineBasedMeasurementGestureAdjustmentSmoke(self): | 
| ps = self.CreateEmptyPageSet() | 
| @@ -113,8 +115,9 @@ class TimelineBasedPageTestTest(page_test_test_case.PageTestTestCase): | 
| 'Gesture_Scroll', 'frame_time_discrepancy') | 
| self.assertEquals(len(v), 1) | 
|  | 
| +  # https://github.com/catapult-project/catapult/issues/3099 (Android) | 
| # Fails on chromeos: crbug.com/483212 | 
| -  @decorators.Disabled('chromeos') | 
| +  @decorators.Disabled('android', 'chromeos') | 
| @decorators.Isolated | 
| def testTBM2ForSmoke(self): | 
| ps = self.CreateEmptyPageSet() | 
| @@ -147,7 +150,8 @@ class TimelineBasedPageTestTest(page_test_test_case.PageTestTestCase): | 
| self.assertEquals(v_foo[0].value, 50) | 
| self.assertIsNotNone(v_foo[0].page) | 
|  | 
| -  @decorators.Disabled('chromeos') | 
| +  # https://github.com/catapult-project/catapult/issues/3099 (Android) | 
| +  @decorators.Disabled('android', 'chromeos') | 
| def testFirstPaintMetricSmoke(self): | 
| ps = self.CreateEmptyPageSet() | 
| ps.AddStory(TestTimelinebasedMeasurementPage(ps, ps.base_dir)) | 
|  |