diff --git a/watchface/src/main/res/raw/watchface_ambient.xml b/watchface/src/main/res/raw/watchface_ambient.xml
index eabee5fd..654655b2 100644
--- a/watchface/src/main/res/raw/watchface_ambient.xml
+++ b/watchface/src/main/res/raw/watchface_ambient.xml
@@ -21,7 +21,7 @@
             <!-- Hide these elements in ambient mode -->
             <Variant mode="AMBIENT" target="alpha" value="0" />
             <!-- Components to show in interactive mode -->
-            <!-- [START_EXCLUDE] -->
+            <!-- [START_EXCLUDE silent] -->
             <PartText x="0" y="0" width="200" height="50">
                 <Text>
                     <Font family="SYNC_TO_DEVICE" size="16">
@@ -34,7 +34,7 @@
         <Group name="logo_ambient" x="100" y="100" width="200" height="200" alpha="0">
             <Variant mode="AMBIENT" target="alpha" value="255" />
             <!-- Components to show in ambient mode -->
-            <!-- [START_EXCLUDE] -->
+            <!-- [START_EXCLUDE silent] -->
             <PartText x="0" y="0" width="200" height="50">
                 <Text>
                     <Font family="SYNC_TO_DEVICE" size="16">
diff --git a/watchface/src/main/res/raw/watchface_basic.xml b/watchface/src/main/res/raw/watchface_basic.xml
index 8c4c2255..86744ca9 100644
--- a/watchface/src/main/res/raw/watchface_basic.xml
+++ b/watchface/src/main/res/raw/watchface_basic.xml
@@ -18,7 +18,7 @@
 <WatchFace width="450" height="450">
     <Scene>
         <!-- Content to be rendered -->
-        <!-- [START_EXCLUDE] -->
+        <!-- [START_EXCLUDE silent] -->
         <PartText x="0" y="0" width="450" height="450">
             <Text align="CENTER">
                 <Font size="32">Snippets</Font>
diff --git a/watchface/src/main/res/raw/watchface_boolean_configuration.xml b/watchface/src/main/res/raw/watchface_boolean_configuration.xml
index d9c6a9cf..ca2327be 100644
--- a/watchface/src/main/res/raw/watchface_boolean_configuration.xml
+++ b/watchface/src/main/res/raw/watchface_boolean_configuration.xml
@@ -33,7 +33,7 @@
         <BooleanConfiguration id="show_date">
             <BooleanOption id="TRUE">
                 <!-- ...Content when date required -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartText x="0" y="50" width="450" height="250">
                     <Text align="CENTER">
                         <Font family="pacifico" size="48">Show date</Font>
@@ -43,7 +43,7 @@
             </BooleanOption>
             <BooleanOption id="FALSE">
                 <!-- ...Content when date not required -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartText x="0" y="50" width="450" height="250">
                     <Text align="CENTER">
                         <Font family="pacifico" size="48">Don't show date</Font>
@@ -64,7 +64,7 @@
             </Expressions>
             <Compare expression="my_expression">
                 <!-- Content goes here -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartText x="0" y="150" width="450" height="250">
                     <Text align="CENTER">
                         <Font family="pacifico" size="48">Complex</Font>
diff --git a/watchface/src/main/res/raw/watchface_complications.xml b/watchface/src/main/res/raw/watchface_complications.xml
index fd87767a..295b6505 100644
--- a/watchface/src/main/res/raw/watchface_complications.xml
+++ b/watchface/src/main/res/raw/watchface_complications.xml
@@ -22,7 +22,7 @@
             <BoundingOval x="0"  y="0" width="100" height="100" />
             <Complication type="SHORT_TEXT">
                 <!-- Complication content for rendering SHORT_TEXT data goes here -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartText x="0" y="0" width="100" height="100">
                     <Text align="CENTER">
                         <Font size="32">
@@ -36,7 +36,7 @@
             </Complication>
             <Complication type="SMALL_IMAGE">
                 <!-- Complication content for rendering SMALL_IMAGE data goes here -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartImage x="0" y="0" width="100" height="100">
                     <Image resource="[COMPLICATION.SMALL_IMAGE]" />
                 </PartImage>
@@ -52,7 +52,7 @@
                 defaultSystemProvider="STEP_COUNT"
                 defaultSystemProviderType="SHORT_TEXT" />
             <!-- ... -->
-            <!-- [START_EXCLUDE] -->
+            <!-- [START_EXCLUDE silent] -->
             <BoundingOval x="0"  y="0" width="250" height="250" />
             <Complication type="SHORT_TEXT">
                 <!-- Complication content for rendering SHORT_TEXT data goes here -->
diff --git a/watchface/src/main/res/raw/watchface_dynamic_content.xml b/watchface/src/main/res/raw/watchface_dynamic_content.xml
index d52edd22..7cc4b108 100644
--- a/watchface/src/main/res/raw/watchface_dynamic_content.xml
+++ b/watchface/src/main/res/raw/watchface_dynamic_content.xml
@@ -29,7 +29,7 @@
             </Expressions>
             <Compare expression="is_early_morning">
                 <!-- Early morning content here -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartText x="0" y="50" width="450" height="250">
                     <Text align="CENTER">
                         <Font family="pacifico" size="96">Early morning</Font>
@@ -39,7 +39,7 @@
             </Compare>
             <Compare expression="is_morning">
                 <!-- Morning content here -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartText x="0" y="50" width="450" height="250">
                     <Text align="CENTER">
                         <Font family="pacifico" size="96">Morning</Font>
diff --git a/watchface/src/main/res/raw/watchface_list_configuration.xml b/watchface/src/main/res/raw/watchface_list_configuration.xml
index f7a165bd..d2b5dd61 100644
--- a/watchface/src/main/res/raw/watchface_list_configuration.xml
+++ b/watchface/src/main/res/raw/watchface_list_configuration.xml
@@ -36,7 +36,7 @@
         <ListConfiguration id="background_image">
             <ListOption id="0">
                 <!-- ...Content for option 0 -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartImage x="0" y="0" width="450" height="450">
                     <Image resource="background0" />
                 </PartImage>
@@ -44,7 +44,7 @@
             </ListOption>
             <ListOption id="1">
                 <!-- ...Content for option 1 -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartImage x="0" y="0" width="450" height="450">
                     <Image resource="background1" />
                 </PartImage>
@@ -63,7 +63,7 @@
             </Expressions>
             <Compare expression="background_zero_and_something_else">
                 <!-- Content goes here -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartText x="0" y="150" width="450" height="250">
                     <Text align="CENTER">
                         <Font family="pacifico" size="48">Complex</Font>
diff --git a/watchface/src/main/res/raw/watchface_weather.xml b/watchface/src/main/res/raw/watchface_weather.xml
index 6abd540f..482a1e35 100644
--- a/watchface/src/main/res/raw/watchface_weather.xml
+++ b/watchface/src/main/res/raw/watchface_weather.xml
@@ -35,7 +35,7 @@
             </Expressions>
             <Compare expression="is_weather_available">
                 <!-- Weather is available, so show the weather data. -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartText x="100" y="200" width="200" height="50">
                     <Text>
                         <Font family="SYNC_TO_DEVICE" size="16">
@@ -47,7 +47,7 @@
             </Compare>
             <Default>
                 <!-- Weather isn't available, so show an appropriate message. -->
-                <!-- [START_EXCLUDE] -->
+                <!-- [START_EXCLUDE silent] -->
                 <PartText x="100" y="200" width="200" height="50">
                     <Text>
                         <Font family="SYNC_TO_DEVICE" size="16">