diff --git a/fuchsia/test_app2/metrics.yaml b/fuchsia/test_app2/metrics.yaml
index 49e0c55..6f31273 100644
--- a/fuchsia/test_app2/metrics.yaml
+++ b/fuchsia/test_app2/metrics.yaml
@@ -73,6 +73,7 @@
       report_type: FLEETWIDE_OCCURRENCE_COUNTS
       privacy_level: LOW_PRIVACY
       system_profile_field: [BOARD_NAME, PRODUCT_NAME]
+      max_count: 20
   meta_data:
     max_release_stage: DEBUG
     expiration_date: "2021/02/27"
@@ -113,6 +114,7 @@
       report_type: STRING_HISTOGRAMS
       privacy_level: LOW_PRIVACY
       system_profile_field: [BOARD_NAME, PRODUCT_NAME]
+      max_count: 30
   meta_data:
     max_release_stage: DEBUG
     expiration_date: "2021/02/27"
@@ -363,9 +365,7 @@
       id: 1
       report_type: UNIQUE_DEVICE_COUNTS
       privacy_level: LOW_PRIVACY
-      window_size:
-        - 1
-        - 7
+      local_aggregation_period: WINDOW_7_DAYS
       system_profile_field: [BOARD_NAME, PRODUCT_NAME]
   meta_data:
     max_release_stage: DEBUG
@@ -1121,9 +1121,7 @@
     - report_name: connection_attempts_per_device_count
       id: 1
       report_type: UNIQUE_DEVICE_NUMERIC_STATS
-      window_size:
-        - 1
-        - 7
+      local_aggregation_period: WINDOW_7_DAYS
       system_profile_field: [BOARD_NAME, PRODUCT_NAME]
   meta_data:
     max_release_stage: DEBUG
@@ -1200,16 +1198,14 @@
     #
     # This is a fictional report used for the development of Cobalt.
     # We use on-device aggregation to collect the per-device total
-    # streaming time over 1-day and 7-day rolling windows. We then
+    # streaming time over a 7-day rolling windows. We then
     # report aggregate statistics of those per-device totals over the
     # fleet, broken down by module name and stream type.
     #####################################################################
     - report_name: streaming_time_per_device_total
       id: 1
       report_type: UNIQUE_DEVICE_NUMERIC_STATS
-      window_size:
-        - 1
-        - 7
+      local_aggregation_period: WINDOW_7_DAYS
       system_profile_field: [BOARD_NAME, PRODUCT_NAME]
   meta_data:
     max_release_stage: DEBUG