Update binary protos.

PiperOrigin-RevId: 252660307
Change-Id: Ib9b1c5db0ec9b6d92957ff60f97bba4990b01e9c
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/background_styles.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/background_styles.gcl.bin
index 398f150..67e9443 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/background_styles.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/background_styles.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/background_styles.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/background_styles.gcl.textpb
index 2d6cfa2..d465fc4 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/background_styles.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/background_styles.gcl.textpb
@@ -90,14 +90,6 @@
           [search.now.ui.stream.PietContent.piet_content_extension] {
             frame {
               tag: "Card Background Color"
-              stylesheet {
-                styles {
-                  style_id: "style:now-card"
-                  background {
-                    color: 4283782655
-                  }
-                }
-              }
               style_references {
                 style_ids: "style:now-card"
               }
@@ -110,6 +102,16 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheets {
+                  styles {
+                    style_id: "style:now-card"
+                    background {
+                      color: 4283782655
+                    }
+                  }
+                }
+              }
             }
           }
         }
@@ -189,26 +191,6 @@
           [search.now.ui.stream.PietContent.piet_content_extension] {
             frame {
               tag: "Card Padding and Margins"
-              stylesheet {
-                styles {
-                  style_id: "style:now-card"
-                  background {
-                    color: 4283782655
-                  }
-                  margins {
-                    top: 32
-                    bottom: 32
-                    start: 16
-                    end: 16
-                  }
-                  padding {
-                    top: 16
-                    bottom: 16
-                    start: 32
-                    end: 32
-                  }
-                }
-              }
               contents {
                 element {
                   text_element {
@@ -221,6 +203,28 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheets {
+                  styles {
+                    style_id: "style:now-card"
+                    background {
+                      color: 4283782655
+                    }
+                    margins {
+                      top: 32
+                      bottom: 32
+                      start: 16
+                      end: 16
+                    }
+                    padding {
+                      top: 16
+                      bottom: 16
+                      start: 32
+                      end: 32
+                    }
+                  }
+                }
+              }
             }
           }
         }
@@ -300,30 +304,6 @@
           [search.now.ui.stream.PietContent.piet_content_extension] {
             frame {
               tag: "Card Padding and Margins with corners"
-              stylesheet {
-                styles {
-                  style_id: "style:now-card"
-                  background {
-                    color: 4283782655
-                  }
-                  margins {
-                    top: 32
-                    bottom: 32
-                    start: 16
-                    end: 16
-                  }
-                  padding {
-                    top: 16
-                    bottom: 16
-                    start: 32
-                    end: 32
-                  }
-                  rounded_corners {
-                    bitmask: 0
-                    radius: 12
-                  }
-                }
-              }
               contents {
                 element {
                   text_element {
@@ -336,6 +316,32 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheets {
+                  styles {
+                    style_id: "style:now-card"
+                    background {
+                      color: 4283782655
+                    }
+                    margins {
+                      top: 32
+                      bottom: 32
+                      start: 16
+                      end: 16
+                    }
+                    padding {
+                      top: 16
+                      bottom: 16
+                      start: 32
+                      end: 32
+                    }
+                    rounded_corners {
+                      bitmask: 0
+                      radius_dp: 12
+                    }
+                  }
+                }
+              }
             }
           }
         }
@@ -415,41 +421,6 @@
           [search.now.ui.stream.PietContent.piet_content_extension] {
             frame {
               tag: "Card Gradient Rounded Corners"
-              stylesheet {
-                styles {
-                  style_id: "style:now-card"
-                  background {
-                    linear_gradient {
-                      stops {
-                        color: 4294901760
-                      }
-                      stops {
-                        color: 4278255360
-                      }
-                      stops {
-                        color: 4278190335
-                      }
-                      stops {
-                        color: 4294901760
-                      }
-                      stops {
-                        color: 4278190335
-                      }
-                      direction_deg: 45
-                    }
-                  }
-                  padding {
-                    top: 16
-                    bottom: 16
-                    start: 16
-                    end: 16
-                  }
-                  rounded_corners {
-                    bitmask: 9
-                    radius: 12
-                  }
-                }
-              }
               contents {
                 element {
                   text_element {
@@ -462,6 +433,43 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheets {
+                  styles {
+                    style_id: "style:now-card"
+                    background {
+                      linear_gradient {
+                        stops {
+                          color: 4294901760
+                        }
+                        stops {
+                          color: 4278255360
+                        }
+                        stops {
+                          color: 4278190335
+                        }
+                        stops {
+                          color: 4294901760
+                        }
+                        stops {
+                          color: 4278190335
+                        }
+                        direction_deg: 45
+                      }
+                    }
+                    padding {
+                      top: 16
+                      bottom: 16
+                      start: 16
+                      end: 16
+                    }
+                    rounded_corners {
+                      bitmask: 9
+                      radius_dp: 12
+                    }
+                  }
+                }
+              }
             }
           }
         }
@@ -541,31 +549,6 @@
           [search.now.ui.stream.PietContent.piet_content_extension] {
             frame {
               tag: "Image corners"
-              stylesheet {
-                styles {
-                  style_id: "style:now-card"
-                  background {
-                    color: 4283782655
-                  }
-                }
-                styles {
-                  style_id: "image"
-                  background {
-                    color: 4294901760
-                  }
-                  padding {
-                    start: 16
-                    end: 16
-                  }
-                  width: 196
-                  height: 196
-                  rounded_corners {
-                    bitmask: 9
-                    radius: 40
-                  }
-                  scale_type: CENTER_CROP
-                }
-              }
               style_references {
                 style_ids: "style:now-card"
               }
@@ -592,6 +575,33 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheets {
+                  styles {
+                    style_id: "style:now-card"
+                    background {
+                      color: 4283782655
+                    }
+                  }
+                  styles {
+                    style_id: "image"
+                    background {
+                      color: 4294901760
+                    }
+                    padding {
+                      start: 16
+                      end: 16
+                    }
+                    width: 196
+                    height: 196
+                    rounded_corners {
+                      bitmask: 9
+                      radius_dp: 40
+                    }
+                    scale_type: CENTER_CROP
+                  }
+                }
+              }
             }
           }
         }
@@ -671,50 +681,6 @@
           [search.now.ui.stream.PietContent.piet_content_extension] {
             frame {
               tag: "Grid Background Color"
-              stylesheet {
-                styles {
-                  style_id: "style:now-card"
-                  padding {
-                    start: 16
-                    end: 16
-                  }
-                }
-                styles {
-                  style_id: "cell"
-                  margins {
-                    top: 4
-                    bottom: 4
-                    start: 8
-                    end: 8
-                  }
-                }
-                styles {
-                  style_id: "red"
-                  background {
-                    color: 4294901760
-                  }
-                }
-                styles {
-                  style_id: "green"
-                  background {
-                    color: 4278255360
-                  }
-                }
-                styles {
-                  style_id: "blue"
-                  background {
-                    color: 4278190335
-                  }
-                }
-                styles {
-                  style_id: "bottom"
-                  gravity_vertical: GRAVITY_BOTTOM
-                }
-                styles {
-                  style_id: "middle"
-                  gravity_vertical: GRAVITY_MIDDLE
-                }
-              }
               style_references {
                 style_ids: "style:now-card"
               }
@@ -860,6 +826,52 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheets {
+                  styles {
+                    style_id: "style:now-card"
+                    padding {
+                      start: 16
+                      end: 16
+                    }
+                  }
+                  styles {
+                    style_id: "cell"
+                    margins {
+                      top: 4
+                      bottom: 4
+                      start: 8
+                      end: 8
+                    }
+                  }
+                  styles {
+                    style_id: "red"
+                    background {
+                      color: 4294901760
+                    }
+                  }
+                  styles {
+                    style_id: "green"
+                    background {
+                      color: 4278255360
+                    }
+                  }
+                  styles {
+                    style_id: "blue"
+                    background {
+                      color: 4278190335
+                    }
+                  }
+                  styles {
+                    style_id: "bottom"
+                    gravity_vertical: GRAVITY_BOTTOM
+                  }
+                  styles {
+                    style_id: "middle"
+                    gravity_vertical: GRAVITY_MIDDLE
+                  }
+                }
+              }
             }
           }
         }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_grid.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_grid.gcl.bin
index a4aaa52..352aab1 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_grid.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_grid.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_grid.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_grid.gcl.textpb
index 8aaa62f..6bad77b 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_grid.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_grid.gcl.textpb
@@ -122,7 +122,6 @@
               table: "piet-shared-state"
             }
             frame {
-              stylesheet_id: "basic-stylesheet"
               contents {
                 element {
                   grid_row {
@@ -186,6 +185,9 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheet_ids: "basic-stylesheet"
+              }
             }
           }
         }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_styles.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_styles.gcl.bin
index 454ce03..49cba37 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_styles.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_styles.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_styles.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_styles.gcl.textpb
index 5264905..ffda878 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_styles.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_styles.gcl.textpb
@@ -117,7 +117,6 @@
               table: "piet-shared-state"
             }
             frame {
-              stylesheet_id: "basic-stylesheet"
               contents {
                 element {
                   element_list {
@@ -148,6 +147,9 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheet_ids: "basic-stylesheet"
+              }
             }
           }
         }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_templates.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_templates.gcl.bin
index b745129..5abd001 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_templates.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_templates.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_templates.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_templates.gcl.textpb
index fc707c6..93894b8 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_templates.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/basic_templates.gcl.textpb
@@ -15,16 +15,6 @@
       piet_shared_state {
         templates {
           template_id: "story-content-template"
-          stylesheet {
-            styles {
-              style_id: "title"
-              color: 4294901760
-            }
-            styles {
-              style_id: "subtitle"
-              color: 4278190335
-            }
-          }
           element {
             element_list {
               contents {
@@ -53,6 +43,18 @@
               }
             }
           }
+          stylesheets {
+            stylesheets {
+              styles {
+                style_id: "title"
+                color: 4294901760
+              }
+              styles {
+                style_id: "subtitle"
+                color: 4278190335
+              }
+            }
+          }
         }
       }
     }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/chunked_text.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/chunked_text.gcl.bin
new file mode 100755
index 0000000..226d1be
--- /dev/null
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/chunked_text.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/complex_layout_text_templates.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/complex_layout_text_templates.gcl.bin
index e20b6d2..195f687 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/complex_layout_text_templates.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/complex_layout_text_templates.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/complex_layout_text_templates.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/complex_layout_text_templates.gcl.textpb
index 3e85ab4..e0bed14 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/complex_layout_text_templates.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/complex_layout_text_templates.gcl.textpb
@@ -26,104 +26,6 @@
         }
         templates {
           template_id: "template1"
-          stylesheet {
-            styles {
-              style_id: "C1"
-              color: 4294901760
-            }
-            styles {
-              style_id: "C2"
-              color: 4278190335
-            }
-            styles {
-              style_id: "C3"
-              color: 4278255360
-            }
-            styles {
-              style_id: "B1"
-              background {
-                color: 4294902015
-              }
-            }
-            styles {
-              style_id: "B2"
-              background {
-                color: 4294967040
-              }
-            }
-            styles {
-              style_id: "B3"
-              background {
-                color: 4278255615
-              }
-            }
-            styles {
-              style_id: "F1"
-              font {
-                size: 6
-              }
-            }
-            styles {
-              style_id: "F2"
-              font {
-                size: 12
-              }
-            }
-            styles {
-              style_id: "F3"
-              font {
-                size: 18
-              }
-            }
-            styles {
-              style_id: "FS1"
-              font {
-                italic: true
-              }
-            }
-            styles {
-              style_id: "FS2"
-              font {
-                weight: BOLD
-              }
-            }
-            styles {
-              style_id: "M1"
-              margins {
-                top: 12
-                bottom: 12
-                start: 0
-                end: 0
-              }
-            }
-            styles {
-              style_id: "M2"
-              margins {
-                top: 0
-                bottom: 0
-                start: 12
-                end: 12
-              }
-            }
-            styles {
-              style_id: "P1"
-              margins {
-                top: 12
-                bottom: 12
-                start: 0
-                end: 0
-              }
-            }
-            styles {
-              style_id: "P2"
-              margins {
-                top: 0
-                bottom: 0
-                start: 12
-                end: 12
-              }
-            }
-          }
           element {
             grid_row {
               cells {
@@ -460,6 +362,106 @@
               }
             }
           }
+          stylesheets {
+            stylesheets {
+              styles {
+                style_id: "C1"
+                color: 4294901760
+              }
+              styles {
+                style_id: "C2"
+                color: 4278190335
+              }
+              styles {
+                style_id: "C3"
+                color: 4278255360
+              }
+              styles {
+                style_id: "B1"
+                background {
+                  color: 4294902015
+                }
+              }
+              styles {
+                style_id: "B2"
+                background {
+                  color: 4294967040
+                }
+              }
+              styles {
+                style_id: "B3"
+                background {
+                  color: 4278255615
+                }
+              }
+              styles {
+                style_id: "F1"
+                font {
+                  size: 6
+                }
+              }
+              styles {
+                style_id: "F2"
+                font {
+                  size: 12
+                }
+              }
+              styles {
+                style_id: "F3"
+                font {
+                  size: 18
+                }
+              }
+              styles {
+                style_id: "FS1"
+                font {
+                  italic: true
+                }
+              }
+              styles {
+                style_id: "FS2"
+                font {
+                  weight: BOLD
+                }
+              }
+              styles {
+                style_id: "M1"
+                margins {
+                  top: 12
+                  bottom: 12
+                  start: 0
+                  end: 0
+                }
+              }
+              styles {
+                style_id: "M2"
+                margins {
+                  top: 0
+                  bottom: 0
+                  start: 12
+                  end: 12
+                }
+              }
+              styles {
+                style_id: "P1"
+                margins {
+                  top: 12
+                  bottom: 12
+                  start: 0
+                  end: 0
+                }
+              }
+              styles {
+                style_id: "P2"
+                margins {
+                  top: 0
+                  bottom: 0
+                  start: 12
+                  end: 12
+                }
+              }
+            }
+          }
         }
         templates {
           template_id: "template2"
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/custom_element.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/custom_element.gcl.bin
new file mode 100755
index 0000000..fbb4fff
--- /dev/null
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/custom_element.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/events_single_large.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/events_single_large.gcl.bin
index 38a4ac5..90e52a2 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/events_single_large.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/events_single_large.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/events_single_large.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/events_single_large.gcl.textpb
index fe88885..9169300 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/events_single_large.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/events_single_large.gcl.textpb
@@ -89,104 +89,6 @@
           type: PIET
           [search.now.ui.stream.PietContent.piet_content_extension] {
             frame {
-              stylesheet {
-                styles {
-                  style_id: "FullWidthWithPadding"
-                  padding {
-                    start: 16
-                    end: 16
-                  }
-                }
-                styles {
-                  style_id: "CardCapTitle"
-                  font {
-                    size: 16
-                  }
-                  padding {
-                    top: 8
-                  }
-                }
-                styles {
-                  style_id: "CardCapSubtitle"
-                  color: 2566914048
-                  font {
-                    size: 14
-                  }
-                  padding {
-                    top: 4
-                    bottom: 8
-                  }
-                }
-                styles {
-                  style_id: "CardCapImage"
-                  padding {
-                    top: 12
-                    end: 16
-                  }
-                  width: 32
-                  height: 32
-                  scale_type: CENTER_INSIDE
-                }
-                styles {
-                  style_id: "Roboto"
-                  font {
-                    typefaces: "Roboto"
-                  }
-                }
-                styles {
-                  style_id: "Tagline"
-                  color: 2566914048
-                  font {
-                    size: 14
-                  }
-                  padding {
-                    top: 8
-                    bottom: 8
-                  }
-                }
-                styles {
-                  style_id: "EventDetails"
-                  margins {
-                    top: 16
-                    bottom: 16
-                  }
-                }
-                styles {
-                  style_id: "EventDateDD"
-                  color: 2566914048
-                  font {
-                    size: 28
-                    weight: LIGHT
-                  }
-                }
-                styles {
-                  style_id: "EventDateMM"
-                  color: 1711276032
-                  font {
-                    size: 12
-                  }
-                }
-                styles {
-                  style_id: "EventTitle"
-                  font {
-                    size: 18
-                  }
-                  margins {
-                    bottom: 8
-                  }
-                  padding {
-                    top: 4
-                  }
-                }
-                styles {
-                  style_id: "EventMetadata"
-                  color: 2566914048
-                  font {
-                    size: 14
-                    line_height_ratio: 1.4
-                  }
-                }
-              }
               contents {
                 element {
                   grid_row {
@@ -371,6 +273,106 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheets {
+                  styles {
+                    style_id: "FullWidthWithPadding"
+                    padding {
+                      start: 16
+                      end: 16
+                    }
+                  }
+                  styles {
+                    style_id: "CardCapTitle"
+                    font {
+                      size: 16
+                    }
+                    padding {
+                      top: 8
+                    }
+                  }
+                  styles {
+                    style_id: "CardCapSubtitle"
+                    color: 2566914048
+                    font {
+                      size: 14
+                    }
+                    padding {
+                      top: 4
+                      bottom: 8
+                    }
+                  }
+                  styles {
+                    style_id: "CardCapImage"
+                    padding {
+                      top: 12
+                      end: 16
+                    }
+                    width: 32
+                    height: 32
+                    scale_type: CENTER_INSIDE
+                  }
+                  styles {
+                    style_id: "Roboto"
+                    font {
+                      typefaces: "Roboto"
+                    }
+                  }
+                  styles {
+                    style_id: "Tagline"
+                    color: 2566914048
+                    font {
+                      size: 14
+                    }
+                    padding {
+                      top: 8
+                      bottom: 8
+                    }
+                  }
+                  styles {
+                    style_id: "EventDetails"
+                    margins {
+                      top: 16
+                      bottom: 16
+                    }
+                  }
+                  styles {
+                    style_id: "EventDateDD"
+                    color: 2566914048
+                    font {
+                      size: 28
+                      weight: LIGHT
+                    }
+                  }
+                  styles {
+                    style_id: "EventDateMM"
+                    color: 1711276032
+                    font {
+                      size: 12
+                    }
+                  }
+                  styles {
+                    style_id: "EventTitle"
+                    font {
+                      size: 18
+                    }
+                    margins {
+                      bottom: 8
+                    }
+                    padding {
+                      top: 4
+                    }
+                  }
+                  styles {
+                    style_id: "EventMetadata"
+                    color: 2566914048
+                    font {
+                      size: 14
+                      line_height_ratio: 1.4
+                    }
+                  }
+                }
+              }
             }
           }
         }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_card_menu.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_card_menu.gcl.bin
new file mode 100755
index 0000000..b80fc76
--- /dev/null
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_card_menu.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_card_menu.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_card_menu.gcl.textpb
new file mode 100755
index 0000000..13de6af
--- /dev/null
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_card_menu.gcl.textpb
@@ -0,0 +1,1076 @@
+initial_response {
+  [search.now.wire.feed.FeedResponse.feed_response] {
+    data_operation {
+      operation: CLEAR_ALL
+    }
+    data_operation {
+      operation: UPDATE_OR_APPEND
+      metadata {
+        content_id {
+          content_domain: "piet-shared-state"
+          id: 1
+          table: "piet-shared-state"
+        }
+      }
+      piet_shared_state {
+        stylesheets {
+          stylesheet_id: "feed-story-card"
+          styles {
+            style_id: "card"
+            padding {
+              start: 16
+              end: 16
+            }
+          }
+          styles {
+            style_id: "mini-card"
+            padding {
+              start: 0
+              end: 0
+            }
+          }
+        }
+        templates {
+          template_id: "story-content-template"
+          element {
+            grid_row {
+              cells {
+                width_binding {
+                  binding_id: "image-width"
+                }
+                content {
+                  element {
+                    image_element {
+                      image_binding {
+                        binding_id: "image-binding"
+                      }
+                    }
+                    style_references {
+                      style_ids: "story"
+                      style_ids: "image"
+                      style_ids: "cell-style"
+                    }
+                    overlays {
+                      element {
+                        image_element {
+                          image {
+                            sources {
+                              url: "asset://offline_indicator_badge"
+                            }
+                          }
+                        }
+                        gravity_horizontal: GRAVITY_END
+                        style_references {
+                          style_ids: "story"
+                          style_ids: "style-badge-icon"
+                        }
+                        gravity_vertical: GRAVITY_BOTTOM
+                        visibility_state {
+                          overriding_bound_visibility {
+                            binding_id: "image-overlay-visibility"
+                          }
+                          default_visibility: GONE
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+              cells {
+                width {
+                  weight: 1
+                }
+                content {
+                  element {
+                    element_list {
+                      contents {
+                        element {
+                          text_element {
+                            parameterized_text_binding {
+                              binding_id: "title-binding"
+                            }
+                          }
+                          style_references {
+                            style_ids: "story"
+                            style_ids: "title"
+                          }
+                        }
+                      }
+                      contents {
+                        element {
+                          grid_row {
+                            cells {
+                              width {
+                                dp: 16
+                              }
+                              content {
+                                element {
+                                  image_element {
+                                    image_binding {
+                                      binding_id: "source-icon-binding"
+                                    }
+                                  }
+                                  style_references {
+                                    style_ids: "story"
+                                    style_ids: "source-icon"
+                                  }
+                                }
+                              }
+                            }
+                            cells {
+                              width {
+                                content_width: CONTENT_WIDTH
+                                is_collapsible: true
+                              }
+                              content {
+                                element {
+                                  text_element {
+                                    parameterized_text_binding {
+                                      binding_id: "source-binding"
+                                    }
+                                  }
+                                  style_references {
+                                    style_ids: "story"
+                                    style_ids: "source"
+                                  }
+                                }
+                              }
+                            }
+                            cells {
+                              width {
+                                content_width: CONTENT_WIDTH
+                              }
+                              content {
+                                element {
+                                  text_element {
+                                    parameterized_text_binding {
+                                      binding_id: "date-binding"
+                                    }
+                                  }
+                                  style_references {
+                                    style_ids: "story"
+                                    style_ids: "date"
+                                  }
+                                }
+                              }
+                            }
+                          }
+                          style_references {
+                            style_ids: "story"
+                            style_ids: "source-row"
+                          }
+                        }
+                      }
+                    }
+                    style_references {
+                      style_ids: "story"
+                    }
+                  }
+                }
+              }
+            }
+            actions_binding {
+              binding_id: "actions-binding"
+            }
+            style_references {
+              style_ids: "story"
+              style_ids: "row-style"
+            }
+          }
+          stylesheets {
+            stylesheets {
+              styles {
+                style_id: "story"
+              }
+              styles {
+                style_id: "row-style"
+                background {
+                  color: 268435456
+                }
+              }
+              styles {
+                style_id: "image"
+                width: 96
+                height: 112
+                image_loading_settings {
+                  pre_load_fill {
+                    color: 4294901760
+                  }
+                }
+                scale_type: CENTER_CROP
+              }
+              styles {
+                style_id: "cell-style"
+                padding {
+                  start: 0
+                  end: 16
+                }
+              }
+              styles {
+                style_id: "title"
+                color: 3724541952
+                font {
+                  size: 16
+                }
+                padding {
+                  top: 16
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
+                min_height: 80
+                max_lines: 3
+              }
+              styles {
+                style_id: "source-row"
+                padding {
+                  top: 6
+                  bottom: 6
+                  start: 6
+                  end: 12
+                }
+              }
+              styles {
+                style_id: "source-icon"
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
+                width: 16
+                height: 16
+              }
+              styles {
+                style_id: "source"
+                font {
+                  size: 12
+                }
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 12
+                  end: 0
+                }
+                max_lines: 1
+              }
+              styles {
+                style_id: "date"
+                font {
+                  size: 12
+                }
+                max_lines: 1
+              }
+              styles {
+                style_id: "style-badge-icon"
+                margins {
+                  bottom: 4
+                  end: 20
+                }
+                width: 18
+                height: 18
+                gravity_horizontal: GRAVITY_END
+                gravity_vertical: GRAVITY_BOTTOM
+              }
+            }
+          }
+        }
+      }
+    }
+    data_operation {
+      operation: UPDATE_OR_APPEND
+      metadata {
+        content_id {
+          content_domain: "root"
+          id: 0
+          table: "FEATURE"
+        }
+      }
+      feature {
+        renderable_unit: STREAM
+      }
+    }
+    data_operation {
+      operation: UPDATE_OR_APPEND
+      metadata {
+        content_id {
+          content_domain: "cluster.f"
+          id: 3001
+          table: "feature"
+        }
+      }
+      feature {
+        parent_id {
+          content_domain: "root"
+          id: 0
+          table: "FEATURE"
+        }
+        renderable_unit: CLUSTER
+        [search.now.ui.stream.Cluster.cluster_extension] {
+        }
+      }
+    }
+    data_operation {
+      operation: UPDATE_OR_APPEND
+      metadata {
+        content_id {
+          content_domain: "card.f"
+          id: 2001
+          table: "feature"
+        }
+      }
+      feature {
+        parent_id {
+          content_domain: "cluster.f"
+          id: 3001
+          table: "feature"
+        }
+        renderable_unit: CARD
+        [search.now.ui.stream.Card.card_extension] {
+          [search.now.ui.stream.SwipeActionExtension.swipe_action_extension] {
+            swipe_action {
+              [search.now.ui.action.FeedAction.feed_action_extension] {
+                metadata {
+                  type: DISMISS_LOCAL
+                  dismiss_data {
+                    content_id {
+                      content_domain: "card.f"
+                      id: 2001
+                      table: "feature"
+                    }
+                    data_operations {
+                      operation: REMOVE
+                      metadata {
+                        content_id {
+                          content_domain: "cluster.f"
+                          id: 3001
+                          table: "feature"
+                        }
+                      }
+                      feature {
+                        parent_id {
+                          content_domain: "root"
+                          id: 0
+                          table: "FEATURE"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    data_operation {
+      operation: UPDATE_OR_APPEND
+      metadata {
+        content_id {
+          content_domain: "content.f"
+          id: 20010
+          table: "feature"
+        }
+      }
+      feature {
+        parent_id {
+          content_domain: "card.f"
+          id: 2001
+          table: "feature"
+        }
+        renderable_unit: CONTENT
+        [search.now.ui.stream.Content.content_extension] {
+          type: PIET
+          representation_data {
+            uri: "http://profootballtalk.nbcsports.com/2017/11/10/jerry-jones-owners-should-approve-of-roger-goodells-decisions/"
+          }
+          offline_metadata {
+            title: "Jerry Jones: Owners should approve of Roger Goodell\'s decisions"
+            image_url: "https://encrypted-tbn3.gstatic.com/images?q=tbn:ANd9GcRydPYA9MW5_G1lKk6fM8OVNf9z7lF5e7ZI2hAAVIAAb-_b3eyQrCQN6j2AcNAaWu-KO11XpQfC-A"
+            publisher: "People talking about football for a long time"
+            favicon_url: "https://www.google.com/s2/favicons?domain=www.profootballtalk.com&sz=48"
+          }
+          [search.now.ui.stream.PietContent.piet_content_extension] {
+            piet_shared_states {
+              content_domain: "piet-shared-state"
+              id: 1
+              table: "piet-shared-state"
+            }
+            frame {
+              tag: "Story-Card-Feed"
+              stylesheet_id: "feed-story-card"
+              style_references {
+                style_ids: "mini-card"
+              }
+              contents {
+                template_invocation {
+                  template_id: "story-content-template"
+                  binding_contexts {
+                    binding_values {
+                      binding_id: "image-binding"
+                      image {
+                        sources {
+                          url: "https://encrypted-tbn3.gstatic.com/images?q=tbn:ANd9GcRydPYA9MW5_G1lKk6fM8OVNf9z7lF5e7ZI2hAAVIAAb-_b3eyQrCQN6j2AcNAaWu-KO11XpQfC-A"
+                        }
+                      }
+                    }
+                    binding_values {
+                      binding_id: "image-width"
+                      cell_width {
+                        dp: 112
+                      }
+                    }
+                    binding_values {
+                      binding_id: "image-overlay-visibility"
+                      host_binding_data {
+                        [search.now.ui.stream.OfflineExtension.offline_extension] {
+                          url: "http://profootballtalk.nbcsports.com/2017/11/10/jerry-jones-owners-should-approve-of-roger-goodells-decisions/"
+                          offline_binding {
+                            visibility: VISIBLE
+                          }
+                          not_offline_binding {
+                            visibility: GONE
+                          }
+                        }
+                      }
+                    }
+                    binding_values {
+                      binding_id: "title-binding"
+                      parameterized_text {
+                        text: "Jerry Jones: Owners should approve of Roger Goodell\'s decisions"
+                      }
+                    }
+                    binding_values {
+                      binding_id: "source-icon-binding"
+                      image {
+                        sources {
+                          url: "https://www.google.com/s2/favicons?domain=www.profootballtalk.com&sz=48"
+                        }
+                      }
+                    }
+                    binding_values {
+                      binding_id: "source-binding"
+                      parameterized_text {
+                        text: "People talking about football for a long time"
+                      }
+                    }
+                    binding_values {
+                      binding_id: "date-binding"
+                      parameterized_text {
+                        text: " \302\267 %s"
+                        parameters {
+                          timestamp_seconds: 1510335173
+                        }
+                      }
+                    }
+                    binding_values {
+                      binding_id: "actions-binding"
+                      actions {
+                        on_click_action {
+                          [search.now.ui.action.PietFeedActionPayload.piet_feed_action_payload_extension] {
+                            feed_action_payload {
+                              [search.now.ui.action.FeedAction.feed_action_extension] {
+                                metadata {
+                                  type: OPEN_URL
+                                  open_url_data {
+                                    url: "http://profootballtalk.nbcsports.com/2017/11/10/jerry-jones-owners-should-approve-of-roger-goodells-decisions/"
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                        on_long_click_action {
+                          [search.now.ui.action.PietFeedActionPayload.piet_feed_action_payload_extension] {
+                            feed_action_payload {
+                              [search.now.ui.action.FeedAction.feed_action_extension] {
+                                metadata {
+                                  type: OPEN_CONTEXT_MENU
+                                  open_context_menu_data {
+                                    context_menu_data {
+                                      label: "Open"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: OPEN_URL
+                                            open_url_data {
+                                              url: "http://profootballtalk.nbcsports.com/2017/11/10/jerry-jones-owners-should-approve-of-roger-goodells-decisions/"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Open in other window"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: OPEN_URL_NEW_WINDOW
+                                            open_url_data {
+                                              url: "http://profootballtalk.nbcsports.com/2017/11/10/jerry-jones-owners-should-approve-of-roger-goodells-decisions/"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Open in incognito"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: OPEN_URL_INCOGNITO
+                                            open_url_data {
+                                              url: "http://profootballtalk.nbcsports.com/2017/11/10/jerry-jones-owners-should-approve-of-roger-goodells-decisions/"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Open in new tab"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: OPEN_URL_NEW_TAB
+                                            open_url_data {
+                                              url: "http://profootballtalk.nbcsports.com/2017/11/10/jerry-jones-owners-should-approve-of-roger-goodells-decisions/"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Remove"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: DISMISS_LOCAL
+                                            dismiss_data {
+                                              content_id {
+                                                content_domain: "content.f"
+                                                id: 20010
+                                                table: "feature"
+                                              }
+                                              data_operations {
+                                                operation: REMOVE
+                                                metadata {
+                                                  content_id {
+                                                    content_domain: "cluster.f"
+                                                    id: 3001
+                                                    table: "feature"
+                                                  }
+                                                }
+                                                feature {
+                                                  parent_id {
+                                                    content_domain: "root"
+                                                    id: 0
+                                                    table: "FEATURE"
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Dismiss with snackbar"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: DISMISS
+                                            dismiss_data {
+                                              content_id {
+                                                content_domain: "content.f"
+                                                id: 20010
+                                                table: "feature"
+                                              }
+                                              data_operations {
+                                                operation: REMOVE
+                                                metadata {
+                                                  content_id {
+                                                    content_domain: "cluster.f"
+                                                    id: 3001
+                                                    table: "feature"
+                                                  }
+                                                }
+                                                feature {
+                                                  parent_id {
+                                                    content_domain: "root"
+                                                    id: 0
+                                                    table: "FEATURE"
+                                                  }
+                                                }
+                                              }
+                                              undo_action {
+                                                confirmation_label: "Server sent string"
+                                                undo_label: "Undo string"
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Not interested in Topic"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: NOT_INTERESTED_IN
+                                            not_interested_in_data {
+                                              undo_action {
+                                                confirmation_label: "You will not see this topic anymore"
+                                                undo_label: "Undo"
+                                              }
+                                              data_operations {
+                                                operation: REMOVE
+                                                metadata {
+                                                  content_id {
+                                                    content_domain: "cluster.f"
+                                                    id: 3001
+                                                    table: "feature"
+                                                  }
+                                                }
+                                                feature {
+                                                  parent_id {
+                                                    content_domain: "root"
+                                                    id: 0
+                                                    table: "FEATURE"
+                                                  }
+                                                }
+                                              }
+                                              interest_type_value: 1
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Download link"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: DOWNLOAD
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Learn more"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: LEARN_MORE
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    data_operation {
+      operation: UPDATE_OR_APPEND
+      metadata {
+        content_id {
+          content_domain: "cluster.f"
+          id: 3002
+          table: "feature"
+        }
+      }
+      feature {
+        parent_id {
+          content_domain: "root"
+          id: 0
+          table: "FEATURE"
+        }
+        renderable_unit: CLUSTER
+        [search.now.ui.stream.Cluster.cluster_extension] {
+        }
+      }
+    }
+    data_operation {
+      operation: UPDATE_OR_APPEND
+      metadata {
+        content_id {
+          content_domain: "card.f"
+          id: 2002
+          table: "feature"
+        }
+      }
+      feature {
+        parent_id {
+          content_domain: "cluster.f"
+          id: 3002
+          table: "feature"
+        }
+        renderable_unit: CARD
+        [search.now.ui.stream.Card.card_extension] {
+          [search.now.ui.stream.SwipeActionExtension.swipe_action_extension] {
+            swipe_action {
+              [search.now.ui.action.FeedAction.feed_action_extension] {
+                metadata {
+                  type: DISMISS_LOCAL
+                  dismiss_data {
+                    content_id {
+                      content_domain: "card.f"
+                      id: 2002
+                      table: "feature"
+                    }
+                    data_operations {
+                      operation: REMOVE
+                      metadata {
+                        content_id {
+                          content_domain: "cluster.f"
+                          id: 3002
+                          table: "feature"
+                        }
+                      }
+                      feature {
+                        parent_id {
+                          content_domain: "root"
+                          id: 0
+                          table: "FEATURE"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    data_operation {
+      operation: UPDATE_OR_APPEND
+      metadata {
+        content_id {
+          content_domain: "content.f"
+          id: 20020
+          table: "feature"
+        }
+      }
+      feature {
+        parent_id {
+          content_domain: "card.f"
+          id: 2002
+          table: "feature"
+        }
+        renderable_unit: CONTENT
+        [search.now.ui.stream.Content.content_extension] {
+          type: PIET
+          representation_data {
+            uri: "https://www.nytimes.com/2017/11/10/world/asia/trump-apec-asia-trade.html"
+          }
+          offline_metadata {
+            title: "Trump Pitches \'American First\' Trade Policy at Asia-Pacific Gathering"
+            image_url: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRh1tEaJT-br6mBxM89U3vgjDldwb9L_baZszhstAGMQh3_fuG13ax3C9ewR2tq45tbZj74CHl3KNU"
+            publisher: "Profootballtalk.com"
+            favicon_url: "https://www.google.com/s2/favicons?domain=www.nytimes.com&sz=48"
+          }
+          [search.now.ui.stream.PietContent.piet_content_extension] {
+            piet_shared_states {
+              content_domain: "piet-shared-state"
+              id: 1
+              table: "piet-shared-state"
+            }
+            frame {
+              tag: "Story-Card-Feed"
+              stylesheet_id: "feed-story-card"
+              style_references {
+                style_ids: "mini-card"
+              }
+              contents {
+                template_invocation {
+                  template_id: "story-content-template"
+                  binding_contexts {
+                    binding_values {
+                      binding_id: "image-binding"
+                      image {
+                        sources {
+                          url: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRh1tEaJT-br6mBxM89U3vgjDldwb9L_baZszhstAGMQh3_fuG13ax3C9ewR2tq45tbZj74CHl3KNU"
+                        }
+                      }
+                    }
+                    binding_values {
+                      binding_id: "image-width"
+                      cell_width {
+                        dp: 112
+                      }
+                    }
+                    binding_values {
+                      binding_id: "image-overlay-visibility"
+                      host_binding_data {
+                        [search.now.ui.stream.OfflineExtension.offline_extension] {
+                          url: "https://www.nytimes.com/2017/11/10/world/asia/trump-apec-asia-trade.html"
+                          offline_binding {
+                            visibility: VISIBLE
+                          }
+                          not_offline_binding {
+                            visibility: GONE
+                          }
+                        }
+                      }
+                    }
+                    binding_values {
+                      binding_id: "title-binding"
+                      parameterized_text {
+                        text: "Trump Pitches \'American First\' Trade Policy at Asia-Pacific Gathering"
+                      }
+                    }
+                    binding_values {
+                      binding_id: "source-icon-binding"
+                      image {
+                        sources {
+                          url: "https://www.google.com/s2/favicons?domain=www.nytimes.com&sz=48"
+                        }
+                      }
+                    }
+                    binding_values {
+                      binding_id: "source-binding"
+                      parameterized_text {
+                        text: "Profootballtalk.com"
+                      }
+                    }
+                    binding_values {
+                      binding_id: "date-binding"
+                      parameterized_text {
+                        text: " \302\267 %s"
+                        parameters {
+                          timestamp_seconds: 1510335173
+                        }
+                      }
+                    }
+                    binding_values {
+                      binding_id: "actions-binding"
+                      actions {
+                        on_click_action {
+                          [search.now.ui.action.PietFeedActionPayload.piet_feed_action_payload_extension] {
+                            feed_action_payload {
+                              [search.now.ui.action.FeedAction.feed_action_extension] {
+                                metadata {
+                                  type: OPEN_URL
+                                  open_url_data {
+                                    url: "https://www.nytimes.com/2017/11/10/world/asia/trump-apec-asia-trade.html"
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                        on_long_click_action {
+                          [search.now.ui.action.PietFeedActionPayload.piet_feed_action_payload_extension] {
+                            feed_action_payload {
+                              [search.now.ui.action.FeedAction.feed_action_extension] {
+                                metadata {
+                                  type: OPEN_CONTEXT_MENU
+                                  open_context_menu_data {
+                                    context_menu_data {
+                                      label: "Open"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: OPEN_URL
+                                            open_url_data {
+                                              url: "https://www.nytimes.com/2017/11/10/world/asia/trump-apec-asia-trade.html"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Open in other window"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: OPEN_URL_NEW_WINDOW
+                                            open_url_data {
+                                              url: "https://www.nytimes.com/2017/11/10/world/asia/trump-apec-asia-trade.html"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Open in incognito"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: OPEN_URL_INCOGNITO
+                                            open_url_data {
+                                              url: "https://www.nytimes.com/2017/11/10/world/asia/trump-apec-asia-trade.html"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Open in new tab"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: OPEN_URL_NEW_TAB
+                                            open_url_data {
+                                              url: "https://www.nytimes.com/2017/11/10/world/asia/trump-apec-asia-trade.html"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Remove"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: DISMISS_LOCAL
+                                            dismiss_data {
+                                              content_id {
+                                                content_domain: "content.f"
+                                                id: 20020
+                                                table: "feature"
+                                              }
+                                              data_operations {
+                                                operation: REMOVE
+                                                metadata {
+                                                  content_id {
+                                                    content_domain: "cluster.f"
+                                                    id: 3002
+                                                    table: "feature"
+                                                  }
+                                                }
+                                                feature {
+                                                  parent_id {
+                                                    content_domain: "root"
+                                                    id: 0
+                                                    table: "FEATURE"
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Dismiss with snackbar"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: DISMISS
+                                            dismiss_data {
+                                              content_id {
+                                                content_domain: "content.f"
+                                                id: 20020
+                                                table: "feature"
+                                              }
+                                              data_operations {
+                                                operation: REMOVE
+                                                metadata {
+                                                  content_id {
+                                                    content_domain: "cluster.f"
+                                                    id: 3002
+                                                    table: "feature"
+                                                  }
+                                                }
+                                                feature {
+                                                  parent_id {
+                                                    content_domain: "root"
+                                                    id: 0
+                                                    table: "FEATURE"
+                                                  }
+                                                }
+                                              }
+                                              undo_action {
+                                                confirmation_label: "Server sent string"
+                                                undo_label: "Undo string"
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Not interested in Topic"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: NOT_INTERESTED_IN
+                                            not_interested_in_data {
+                                              undo_action {
+                                                confirmation_label: "You will not see this topic anymore"
+                                                undo_label: "Undo"
+                                              }
+                                              data_operations {
+                                                operation: REMOVE
+                                                metadata {
+                                                  content_id {
+                                                    content_domain: "cluster.f"
+                                                    id: 3002
+                                                    table: "feature"
+                                                  }
+                                                }
+                                                feature {
+                                                  parent_id {
+                                                    content_domain: "root"
+                                                    id: 0
+                                                    table: "FEATURE"
+                                                  }
+                                                }
+                                              }
+                                              interest_type_value: 1
+                                            }
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Download link"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: DOWNLOAD
+                                          }
+                                        }
+                                      }
+                                    }
+                                    context_menu_data {
+                                      label: "Learn more"
+                                      feed_action_payload {
+                                        [search.now.ui.action.FeedAction.feed_action_extension] {
+                                          metadata {
+                                            type: LEARN_MORE
+                                          }
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_carousels.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_carousels.gcl.bin
new file mode 100755
index 0000000..94b1594
--- /dev/null
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_carousels.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large.gcl.bin
index a237e75..0b79a89 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large.gcl.textpb
index 758417c..e62302b 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large.gcl.textpb
@@ -32,101 +32,6 @@
         }
         templates {
           template_id: "story-content-template"
-          stylesheet {
-            styles {
-              style_id: "story"
-            }
-            styles {
-              style_id: "row-style"
-              background {
-                color: 268435456
-              }
-            }
-            styles {
-              style_id: "image"
-              width: 96
-              height: 112
-              image_loading_settings {
-                pre_load_fill {
-                  color: 4294901760
-                }
-              }
-              scale_type: CENTER_CROP
-            }
-            styles {
-              style_id: "cell-style"
-              padding {
-                start: 0
-                end: 16
-              }
-            }
-            styles {
-              style_id: "title"
-              color: 3724541952
-              font {
-                size: 16
-              }
-              padding {
-                top: 16
-                bottom: 0
-                start: 0
-                end: 0
-              }
-              min_height: 80
-              max_lines: 3
-            }
-            styles {
-              style_id: "source-row"
-              padding {
-                top: 6
-                bottom: 6
-                start: 6
-                end: 12
-              }
-            }
-            styles {
-              style_id: "source-icon"
-              padding {
-                top: 0
-                bottom: 0
-                start: 0
-                end: 0
-              }
-              width: 16
-              height: 16
-            }
-            styles {
-              style_id: "source"
-              font {
-                size: 12
-              }
-              padding {
-                top: 0
-                bottom: 0
-                start: 12
-                end: 0
-              }
-              max_lines: 1
-            }
-            styles {
-              style_id: "date"
-              font {
-                size: 12
-              }
-              max_lines: 1
-            }
-            styles {
-              style_id: "style-badge-icon"
-              margins {
-                bottom: 4
-                end: 20
-              }
-              width: 18
-              height: 18
-              gravity_horizontal: GRAVITY_END
-              gravity_vertical: GRAVITY_BOTTOM
-            }
-          }
           element {
             grid_row {
               cells {
@@ -271,6 +176,103 @@
               style_ids: "row-style"
             }
           }
+          stylesheets {
+            stylesheets {
+              styles {
+                style_id: "story"
+              }
+              styles {
+                style_id: "row-style"
+                background {
+                  color: 268435456
+                }
+              }
+              styles {
+                style_id: "image"
+                width: 96
+                height: 112
+                image_loading_settings {
+                  pre_load_fill {
+                    color: 4294901760
+                  }
+                }
+                scale_type: CENTER_CROP
+              }
+              styles {
+                style_id: "cell-style"
+                padding {
+                  start: 0
+                  end: 16
+                }
+              }
+              styles {
+                style_id: "title"
+                color: 3724541952
+                font {
+                  size: 16
+                }
+                padding {
+                  top: 16
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
+                min_height: 80
+                max_lines: 3
+              }
+              styles {
+                style_id: "source-row"
+                padding {
+                  top: 6
+                  bottom: 6
+                  start: 6
+                  end: 12
+                }
+              }
+              styles {
+                style_id: "source-icon"
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
+                width: 16
+                height: 16
+              }
+              styles {
+                style_id: "source"
+                font {
+                  size: 12
+                }
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 12
+                  end: 0
+                }
+                max_lines: 1
+              }
+              styles {
+                style_id: "date"
+                font {
+                  size: 12
+                }
+                max_lines: 1
+              }
+              styles {
+                style_id: "style-badge-icon"
+                margins {
+                  bottom: 4
+                  end: 20
+                }
+                width: 18
+                height: 18
+                gravity_horizontal: GRAVITY_END
+                gravity_vertical: GRAVITY_BOTTOM
+              }
+            }
+          }
         }
       }
     }
@@ -613,7 +615,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -636,6 +638,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -1003,7 +1006,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -1026,6 +1029,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -1393,7 +1397,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -1416,6 +1420,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -1783,7 +1788,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -1806,6 +1811,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2173,7 +2179,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2196,6 +2202,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2563,7 +2570,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2586,6 +2593,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2953,7 +2961,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2976,6 +2984,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -3343,7 +3352,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -3366,6 +3375,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -3733,7 +3743,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -3756,6 +3766,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -4123,7 +4134,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -4146,6 +4157,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -4513,7 +4525,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -4536,6 +4548,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -4903,7 +4916,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -4926,6 +4939,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -5293,7 +5307,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -5316,6 +5330,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -5683,7 +5698,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -5706,6 +5721,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -6073,7 +6089,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -6096,6 +6112,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -6463,7 +6480,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -6486,6 +6503,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -6853,7 +6871,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -6876,6 +6894,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -7243,7 +7262,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -7266,6 +7285,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -7633,7 +7653,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -7656,6 +7676,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -8023,7 +8044,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -8046,6 +8067,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -8413,7 +8435,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -8436,6 +8458,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -8803,7 +8826,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -8826,6 +8849,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -9193,7 +9217,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -9216,6 +9240,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -9583,7 +9608,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -9606,6 +9631,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -9973,7 +9999,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -9996,6 +10022,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -10363,7 +10390,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -10386,6 +10413,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -10753,7 +10781,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -10776,6 +10804,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -11143,7 +11172,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -11166,6 +11195,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -11533,7 +11563,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -11556,6 +11586,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -11923,7 +11954,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -11946,6 +11977,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -12313,7 +12345,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -12336,6 +12368,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -12703,7 +12736,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -12726,6 +12759,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -13093,7 +13127,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -13116,6 +13150,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -13483,7 +13518,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -13506,6 +13541,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -13873,7 +13909,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -13896,6 +13932,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -14263,7 +14300,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -14286,6 +14323,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -14653,7 +14691,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -14676,6 +14714,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -15043,7 +15082,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -15066,6 +15105,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -15433,7 +15473,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -15456,6 +15496,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -15823,7 +15864,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -15846,6 +15887,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -16213,7 +16255,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -16236,6 +16278,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -16603,7 +16646,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -16626,6 +16669,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -16993,7 +17037,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -17016,6 +17060,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -17383,7 +17428,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -17406,6 +17451,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -17773,7 +17819,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -17796,6 +17842,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -18163,7 +18210,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -18186,6 +18233,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -18553,7 +18601,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -18576,6 +18624,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -18943,7 +18992,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -18966,6 +19015,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -19333,7 +19383,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -19356,6 +19406,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -19723,7 +19774,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -19746,6 +19797,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -20113,7 +20165,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -20136,6 +20188,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -20503,7 +20556,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -20526,6 +20579,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -20893,7 +20947,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -20916,6 +20970,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -21283,7 +21338,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -21306,6 +21361,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -21673,7 +21729,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -21696,6 +21752,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -22063,7 +22120,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -22086,6 +22143,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -22453,7 +22511,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -22476,6 +22534,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -22843,7 +22902,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -22866,6 +22925,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -23233,7 +23293,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -23256,6 +23316,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -23623,7 +23684,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -23646,6 +23707,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -24013,7 +24075,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -24036,6 +24098,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -24403,7 +24466,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -24426,6 +24489,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -24793,7 +24857,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -24816,6 +24880,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -25183,7 +25248,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -25206,6 +25271,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -25573,7 +25639,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -25596,6 +25662,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -25963,7 +26030,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -25986,6 +26053,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -26353,7 +26421,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -26376,6 +26444,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -26743,7 +26812,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -26766,6 +26835,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -27133,7 +27203,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -27156,6 +27226,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -27523,7 +27594,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -27546,6 +27617,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -27913,7 +27985,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -27936,6 +28008,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -28303,7 +28376,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -28326,6 +28399,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -28693,7 +28767,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -28716,6 +28790,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -29083,7 +29158,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -29106,6 +29181,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -29473,7 +29549,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -29496,6 +29572,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -29863,7 +29940,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -29886,6 +29963,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -30253,7 +30331,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -30276,6 +30354,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -30643,7 +30722,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -30666,6 +30745,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -31033,7 +31113,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -31056,6 +31136,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -31423,7 +31504,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -31446,6 +31527,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -31813,7 +31895,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -31836,6 +31918,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -32203,7 +32286,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -32226,6 +32309,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -32593,7 +32677,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -32616,6 +32700,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -32983,7 +33068,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -33006,6 +33091,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -33373,7 +33459,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -33396,6 +33482,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -33763,7 +33850,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -33786,6 +33873,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -34153,7 +34241,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -34176,6 +34264,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -34543,7 +34632,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -34566,6 +34655,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -34933,7 +35023,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -34956,6 +35046,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -35323,7 +35414,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -35346,6 +35437,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -35713,7 +35805,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -35736,6 +35828,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -36103,7 +36196,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -36126,6 +36219,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -36493,7 +36587,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -36516,6 +36610,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -36883,7 +36978,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -36906,6 +37001,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -37273,7 +37369,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -37296,6 +37392,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -37663,7 +37760,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -37686,6 +37783,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -38053,7 +38151,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -38076,6 +38174,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -38443,7 +38542,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -38466,6 +38565,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -38833,7 +38933,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -38856,6 +38956,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -39223,7 +39324,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -39246,6 +39347,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large_M72.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large_M72.gcl.bin
index 20ee857..73d34ef 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large_M72.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large_M72.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large_M72.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large_M72.gcl.textpb
index ecf9ac9..a00ac29 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large_M72.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_large_M72.gcl.textpb
@@ -616,7 +616,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -639,6 +639,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -1006,7 +1007,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -1029,6 +1030,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -1396,7 +1398,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -1419,6 +1421,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -1786,7 +1789,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -1809,6 +1812,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2176,7 +2180,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2199,6 +2203,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2566,7 +2571,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2589,6 +2594,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2956,7 +2962,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2979,6 +2985,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -3346,7 +3353,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -3369,6 +3376,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -3736,7 +3744,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -3759,6 +3767,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -4126,7 +4135,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -4149,6 +4158,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -4516,7 +4526,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -4539,6 +4549,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -4906,7 +4917,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -4929,6 +4940,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -5296,7 +5308,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -5319,6 +5331,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -5686,7 +5699,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -5709,6 +5722,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -6076,7 +6090,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -6099,6 +6113,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -6466,7 +6481,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -6489,6 +6504,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -6856,7 +6872,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -6879,6 +6895,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -7246,7 +7263,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -7269,6 +7286,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -7636,7 +7654,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -7659,6 +7677,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -8026,7 +8045,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -8049,6 +8068,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -8416,7 +8436,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -8439,6 +8459,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -8806,7 +8827,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -8829,6 +8850,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -9196,7 +9218,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -9219,6 +9241,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -9586,7 +9609,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -9609,6 +9632,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -9976,7 +10000,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -9999,6 +10023,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -10366,7 +10391,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -10389,6 +10414,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -10756,7 +10782,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -10779,6 +10805,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -11146,7 +11173,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -11169,6 +11196,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -11536,7 +11564,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -11559,6 +11587,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -11926,7 +11955,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -11949,6 +11978,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -12316,7 +12346,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -12339,6 +12369,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -12706,7 +12737,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -12729,6 +12760,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -13096,7 +13128,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -13119,6 +13151,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -13486,7 +13519,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -13509,6 +13542,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -13876,7 +13910,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -13899,6 +13933,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -14266,7 +14301,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -14289,6 +14324,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -14656,7 +14692,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -14679,6 +14715,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -15046,7 +15083,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -15069,6 +15106,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -15436,7 +15474,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -15459,6 +15497,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -15826,7 +15865,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -15849,6 +15888,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -16216,7 +16256,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -16239,6 +16279,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -16606,7 +16647,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -16629,6 +16670,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -16996,7 +17038,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -17019,6 +17061,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -17386,7 +17429,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -17409,6 +17452,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -17776,7 +17820,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -17799,6 +17843,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -18166,7 +18211,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -18189,6 +18234,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -18556,7 +18602,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -18579,6 +18625,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -18946,7 +18993,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -18969,6 +19016,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -19336,7 +19384,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -19359,6 +19407,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -19726,7 +19775,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -19749,6 +19798,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -20116,7 +20166,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -20139,6 +20189,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -20506,7 +20557,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -20529,6 +20580,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -20896,7 +20948,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -20919,6 +20971,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -21286,7 +21339,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -21309,6 +21362,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -21676,7 +21730,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -21699,6 +21753,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -22066,7 +22121,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -22089,6 +22144,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -22456,7 +22512,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -22479,6 +22535,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -22846,7 +22903,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -22869,6 +22926,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -23236,7 +23294,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -23259,6 +23317,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -23626,7 +23685,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -23649,6 +23708,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -24016,7 +24076,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -24039,6 +24099,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -24406,7 +24467,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -24429,6 +24490,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -24796,7 +24858,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -24819,6 +24881,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -25186,7 +25249,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -25209,6 +25272,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -25576,7 +25640,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -25599,6 +25663,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -25966,7 +26031,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -25989,6 +26054,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -26356,7 +26422,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -26379,6 +26445,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -26746,7 +26813,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -26769,6 +26836,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -27136,7 +27204,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -27159,6 +27227,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -27526,7 +27595,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -27549,6 +27618,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -27916,7 +27986,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -27939,6 +28009,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -28306,7 +28377,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -28329,6 +28400,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -28696,7 +28768,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -28719,6 +28791,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -29086,7 +29159,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -29109,6 +29182,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -29476,7 +29550,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -29499,6 +29573,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -29866,7 +29941,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -29889,6 +29964,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -30256,7 +30332,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -30279,6 +30355,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -30646,7 +30723,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -30669,6 +30746,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -31036,7 +31114,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -31059,6 +31137,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -31426,7 +31505,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -31449,6 +31528,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -31816,7 +31896,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -31839,6 +31919,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -32206,7 +32287,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -32229,6 +32310,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -32596,7 +32678,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -32619,6 +32701,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -32986,7 +33069,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -33009,6 +33092,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -33376,7 +33460,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -33399,6 +33483,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -33766,7 +33851,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -33789,6 +33874,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -34156,7 +34242,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -34179,6 +34265,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -34546,7 +34633,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -34569,6 +34656,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -34936,7 +35024,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -34959,6 +35047,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -35326,7 +35415,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -35349,6 +35438,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -35716,7 +35806,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -35739,6 +35829,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -36106,7 +36197,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -36129,6 +36220,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -36496,7 +36588,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -36519,6 +36611,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -36886,7 +36979,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -36909,6 +37002,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -37276,7 +37370,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -37299,6 +37393,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -37666,7 +37761,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -37689,6 +37784,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -38056,7 +38152,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -38079,6 +38175,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -38446,7 +38543,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -38469,6 +38566,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -38836,7 +38934,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -38859,6 +38957,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -39226,7 +39325,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -39249,6 +39348,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_paging.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_paging.gcl.bin
index d1461a3..2b7a63d 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_paging.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_paging.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_paging.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_paging.gcl.textpb
index 3078cd5..d59a61f 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_paging.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_paging.gcl.textpb
@@ -32,88 +32,6 @@
         }
         templates {
           template_id: "story-content-template"
-          stylesheet {
-            styles {
-              style_id: "story"
-            }
-            styles {
-              style_id: "row-style"
-              background {
-                color: 268435456
-              }
-            }
-            styles {
-              style_id: "image"
-              width: 96
-              height: 112
-              scale_type: CENTER_CROP
-            }
-            styles {
-              style_id: "cell-style"
-              padding {
-                start: 0
-                end: 16
-              }
-            }
-            styles {
-              style_id: "title"
-              color: 3724541952
-              font {
-                size: 16
-              }
-              padding {
-                top: 16
-                bottom: 0
-                start: 0
-                end: 0
-              }
-              min_height: 80
-              max_lines: 3
-            }
-            styles {
-              style_id: "source-row"
-              padding {
-                top: 2
-                bottom: 0
-                start: 0
-                end: 0
-              }
-            }
-            styles {
-              style_id: "source-icon"
-              padding {
-                top: 0
-                bottom: 0
-                start: 0
-                end: 0
-              }
-              width: 16
-              height: 16
-            }
-            styles {
-              style_id: "source"
-              font {
-                size: 12
-              }
-              padding {
-                top: 0
-                bottom: 0
-                start: 12
-                end: 0
-              }
-            }
-            styles {
-              style_id: "style-badge-icon"
-              margins {
-                bottom: 4
-                end: 20
-              }
-              width: 18
-              height: 18
-              gravity_horizontal: GRAVITY_END
-              gravity_vertical: GRAVITY_BOTTOM
-            }
-          }
           element {
             grid_row {
               cells {
@@ -237,6 +155,90 @@
               style_ids: "row-style"
             }
           }
+          stylesheets {
+            stylesheets {
+              styles {
+                style_id: "story"
+              }
+              styles {
+                style_id: "row-style"
+                background {
+                  color: 268435456
+                }
+              }
+              styles {
+                style_id: "image"
+                width: 96
+                height: 112
+                scale_type: CENTER_CROP
+              }
+              styles {
+                style_id: "cell-style"
+                padding {
+                  start: 0
+                  end: 16
+                }
+              }
+              styles {
+                style_id: "title"
+                color: 3724541952
+                font {
+                  size: 16
+                }
+                padding {
+                  top: 16
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
+                min_height: 80
+                max_lines: 3
+              }
+              styles {
+                style_id: "source-row"
+                padding {
+                  top: 2
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
+              }
+              styles {
+                style_id: "source-icon"
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
+                width: 16
+                height: 16
+              }
+              styles {
+                style_id: "source"
+                font {
+                  size: 12
+                }
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 12
+                  end: 0
+                }
+              }
+              styles {
+                style_id: "style-badge-icon"
+                margins {
+                  bottom: 4
+                  end: 20
+                }
+                width: 18
+                height: 18
+                gravity_horizontal: GRAVITY_END
+                gravity_vertical: GRAVITY_BOTTOM
+              }
+            }
+          }
         }
       }
     }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_tooltip.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_tooltip.gcl.bin
old mode 100644
new mode 100755
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_hero.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_hero.gcl.bin
index 5579113..fddfc15 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_hero.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_hero.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_hero.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_hero.gcl.textpb
index b9e2ea4..81950c3 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_hero.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_hero.gcl.textpb
@@ -25,68 +25,6 @@
         }
         templates {
           template_id: "two-line-card-cap-template"
-          stylesheet {
-            styles {
-              style_id: "card-cap"
-              padding {
-                top: 4
-                bottom: 4
-                start: 16
-                end: 16
-              }
-              min_height: 42
-            }
-            styles {
-              style_id: "title-container"
-              padding {
-                top: 0
-                bottom: 0
-                start: 0
-                end: 0
-              }
-            }
-            styles {
-              style_id: "title"
-              color: 2315255808
-              font {
-                size: 14
-              }
-            }
-            styles {
-              style_id: "subtitle"
-              color: 2315255808
-              font {
-                size: 12
-                italic: true
-              }
-              padding {
-                top: 2
-                bottom: 0
-                start: 0
-                end: 0
-              }
-            }
-            styles {
-              style_id: "icon-cell"
-              padding {
-                top: 0
-                bottom: 0
-                start: 0
-                end: 0
-              }
-            }
-            styles {
-              style_id: "icon"
-              margins {
-                top: 0
-                bottom: 0
-                start: 0
-                end: 8
-              }
-              width: 24
-              height: 24
-            }
-          }
           element {
             grid_row {
               cells {
@@ -148,93 +86,73 @@
               style_ids: "card-cap"
             }
           }
-        }
-        templates {
-          template_id: "story-content-template"
-          stylesheet {
-            styles {
-              style_id: "story"
-              padding {
-                top: 0
-                bottom: 0
-                start: 8
-                end: 8
+          stylesheets {
+            stylesheets {
+              styles {
+                style_id: "card-cap"
+                padding {
+                  top: 4
+                  bottom: 4
+                  start: 16
+                  end: 16
+                }
+                min_height: 42
               }
-            }
-            styles {
-              style_id: "image"
-              margins {
-                start: 8
-                end: 16
+              styles {
+                style_id: "title-container"
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
               }
-              width: 72
-              height: 72
-              scale_type: CENTER_CROP
-            }
-            styles {
-              style_id: "title"
-              color: 3724541952
-              font {
-                size: 18
+              styles {
+                style_id: "title"
+                color: 2315255808
+                font {
+                  size: 14
+                }
               }
-              padding {
-                top: 0
-                bottom: 4
-                start: 8
-                end: 8
+              styles {
+                style_id: "subtitle"
+                color: 2315255808
+                font {
+                  size: 12
+                  italic: true
+                }
+                padding {
+                  top: 2
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
               }
-              max_lines: 2
-            }
-            styles {
-              style_id: "snippet"
-              color: 2315255808
-              font {
-                size: 14
+              styles {
+                style_id: "icon-cell"
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
               }
-              padding {
-                top: 0
-                bottom: 8
-                start: 8
-                end: 8
-              }
-              max_lines: 2
-            }
-            styles {
-              style_id: "source-row"
-              padding {
-                top: 0
-                bottom: 12
-                start: 8
-                end: 8
-              }
-            }
-            styles {
-              style_id: "source-icon-list"
-              padding {
-                top: 0
-                bottom: 0
-                start: 0
-                end: 0
-              }
-            }
-            styles {
-              style_id: "source-icon"
-              width: 16
-              height: 16
-            }
-            styles {
-              style_id: "source"
-              font {
-                size: 14
-              }
-              padding {
-                top: 0
-                bottom: 0
-                start: 12
-                end: 0
+              styles {
+                style_id: "icon"
+                margins {
+                  top: 0
+                  bottom: 0
+                  start: 0
+                  end: 8
+                }
+                width: 24
+                height: 24
               }
             }
           }
+        }
+        templates {
+          template_id: "story-content-template"
           element {
             grid_row {
               cells {
@@ -338,108 +256,95 @@
               binding_id: "actions-binding"
             }
           }
-        }
-        templates {
-          template_id: "hero-story-content-template"
-          stylesheet {
-            styles {
-              style_id: "story"
-              padding {
-                top: 0
-                bottom: 0
-                start: 8
-                end: 8
+          stylesheets {
+            stylesheets {
+              styles {
+                style_id: "story"
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 8
+                  end: 8
+                }
               }
-            }
-            styles {
-              style_id: "image"
-              padding {
-                top: 0
-                bottom: 8
-                start: 16
-                end: 16
+              styles {
+                style_id: "image"
+                margins {
+                  start: 8
+                  end: 16
+                }
+                width: 72
+                height: 72
+                scale_type: CENTER_CROP
               }
-              height: 180
-              scale_type: CENTER_CROP
-            }
-            styles {
-              style_id: "overlay1"
-              width: 128
-              height: 128
-              scale_type: CENTER_CROP
-              gravity_horizontal: GRAVITY_CENTER
-            }
-            styles {
-              style_id: "overlay2"
-              width: 64
-              height: 64
-              scale_type: CENTER_CROP
-              gravity_horizontal: GRAVITY_CENTER
-            }
-            styles {
-              style_id: "title"
-              color: 3724541952
-              font {
-                size: 18
+              styles {
+                style_id: "title"
+                color: 3724541952
+                font {
+                  size: 18
+                }
+                padding {
+                  top: 0
+                  bottom: 4
+                  start: 8
+                  end: 8
+                }
+                max_lines: 2
               }
-              padding {
-                top: 0
-                bottom: 0
-                start: 16
-                end: 16
+              styles {
+                style_id: "snippet"
+                color: 2315255808
+                font {
+                  size: 14
+                }
+                padding {
+                  top: 0
+                  bottom: 8
+                  start: 8
+                  end: 8
+                }
+                max_lines: 2
               }
-              max_lines: 2
-            }
-            styles {
-              style_id: "snippet"
-              color: 2315255808
-              font {
-                size: 14
+              styles {
+                style_id: "source-row"
+                padding {
+                  top: 0
+                  bottom: 12
+                  start: 8
+                  end: 8
+                }
               }
-              padding {
-                top: 4
-                bottom: 8
-                start: 16
-                end: 16
+              styles {
+                style_id: "source-icon-list"
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
               }
-              max_lines: 2
-            }
-            styles {
-              style_id: "source-row"
-              padding {
-                top: 0
-                bottom: 12
-                start: 16
-                end: 16
+              styles {
+                style_id: "source-icon"
+                width: 16
+                height: 16
               }
-            }
-            styles {
-              style_id: "source-icon-list"
-              padding {
-                top: 0
-                bottom: 0
-                start: 0
-                end: 0
-              }
-            }
-            styles {
-              style_id: "source-icon"
-              width: 16
-              height: 16
-            }
-            styles {
-              style_id: "source"
-              font {
-                size: 14
-              }
-              padding {
-                top: 0
-                bottom: 0
-                start: 12
-                end: 0
+              styles {
+                style_id: "source"
+                font {
+                  size: 14
+                }
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 12
+                  end: 0
+                }
               }
             }
           }
+        }
+        templates {
+          template_id: "hero-story-content-template"
           element {
             element_list {
               contents {
@@ -554,6 +459,107 @@
               binding_id: "actions-binding"
             }
           }
+          stylesheets {
+            stylesheets {
+              styles {
+                style_id: "story"
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 8
+                  end: 8
+                }
+              }
+              styles {
+                style_id: "image"
+                padding {
+                  top: 0
+                  bottom: 8
+                  start: 16
+                  end: 16
+                }
+                height: 180
+                scale_type: CENTER_CROP
+              }
+              styles {
+                style_id: "overlay1"
+                width: 128
+                height: 128
+                scale_type: CENTER_CROP
+                gravity_horizontal: GRAVITY_CENTER
+              }
+              styles {
+                style_id: "overlay2"
+                width: 64
+                height: 64
+                scale_type: CENTER_CROP
+                gravity_horizontal: GRAVITY_CENTER
+              }
+              styles {
+                style_id: "title"
+                color: 3724541952
+                font {
+                  size: 18
+                }
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 16
+                  end: 16
+                }
+                max_lines: 2
+              }
+              styles {
+                style_id: "snippet"
+                color: 2315255808
+                font {
+                  size: 14
+                }
+                padding {
+                  top: 4
+                  bottom: 8
+                  start: 16
+                  end: 16
+                }
+                max_lines: 2
+              }
+              styles {
+                style_id: "source-row"
+                padding {
+                  top: 0
+                  bottom: 12
+                  start: 16
+                  end: 16
+                }
+              }
+              styles {
+                style_id: "source-icon-list"
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
+              }
+              styles {
+                style_id: "source-icon"
+                width: 16
+                height: 16
+              }
+              styles {
+                style_id: "source"
+                font {
+                  size: 14
+                }
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 12
+                  end: 0
+                }
+              }
+            }
+          }
         }
       }
     }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay.gcl.bin
index 9948596..f8b3524 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay.gcl.textpb
index 8d50a43..79ac10e 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay.gcl.textpb
@@ -32,77 +32,6 @@
         }
         templates {
           template_id: "story-content-template"
-          stylesheet {
-            styles {
-              style_id: "story"
-            }
-            styles {
-              style_id: "row-style"
-              background {
-                color: 268435456
-              }
-            }
-            styles {
-              style_id: "image"
-              width: 96
-              height: 112
-              scale_type: CENTER_CROP
-            }
-            styles {
-              style_id: "cell-style"
-              padding {
-                start: 0
-                end: 16
-              }
-            }
-            styles {
-              style_id: "title"
-              color: 3724541952
-              font {
-                size: 16
-              }
-              padding {
-                top: 16
-                bottom: 0
-                start: 0
-                end: 0
-              }
-              min_height: 80
-              max_lines: 3
-            }
-            styles {
-              style_id: "source-row"
-              padding {
-                top: 2
-                bottom: 0
-                start: 0
-                end: 0
-              }
-            }
-            styles {
-              style_id: "source-icon"
-              padding {
-                top: 0
-                bottom: 0
-                start: 0
-                end: 0
-              }
-              width: 16
-              height: 16
-            }
-            styles {
-              style_id: "source"
-              font {
-                size: 12
-              }
-              padding {
-                top: 0
-                bottom: 0
-                start: 12
-                end: 0
-              }
-            }
-          }
           element {
             grid_row {
               cells {
@@ -203,6 +132,79 @@
               style_ids: "row-style"
             }
           }
+          stylesheets {
+            stylesheets {
+              styles {
+                style_id: "story"
+              }
+              styles {
+                style_id: "row-style"
+                background {
+                  color: 268435456
+                }
+              }
+              styles {
+                style_id: "image"
+                width: 96
+                height: 112
+                scale_type: CENTER_CROP
+              }
+              styles {
+                style_id: "cell-style"
+                padding {
+                  start: 0
+                  end: 16
+                }
+              }
+              styles {
+                style_id: "title"
+                color: 3724541952
+                font {
+                  size: 16
+                }
+                padding {
+                  top: 16
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
+                min_height: 80
+                max_lines: 3
+              }
+              styles {
+                style_id: "source-row"
+                padding {
+                  top: 2
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
+              }
+              styles {
+                style_id: "source-icon"
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 0
+                  end: 0
+                }
+                width: 16
+                height: 16
+              }
+              styles {
+                style_id: "source"
+                font {
+                  size: 12
+                }
+                padding {
+                  top: 0
+                  bottom: 0
+                  start: 12
+                  end: 0
+                }
+              }
+            }
+          }
         }
       }
     }
@@ -525,7 +527,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -548,6 +550,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -895,7 +898,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -918,6 +921,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -1265,7 +1269,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -1288,6 +1292,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -1635,7 +1640,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -1658,6 +1663,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2005,7 +2011,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2028,6 +2034,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2375,7 +2382,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2398,6 +2405,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2745,7 +2753,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2768,6 +2776,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -3115,7 +3124,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -3138,6 +3147,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay_M72.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay_M72.gcl.bin
index a050b92..2d174b9 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay_M72.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay_M72.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay_M72.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay_M72.gcl.textpb
index 87221c1..2c3aee9 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay_M72.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/feed_with_overlay_M72.gcl.textpb
@@ -529,7 +529,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -552,6 +552,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -899,7 +900,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -922,6 +923,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -1269,7 +1271,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -1292,6 +1294,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -1639,7 +1642,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -1662,6 +1665,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2009,7 +2013,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2032,6 +2036,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2379,7 +2384,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2402,6 +2407,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -2749,7 +2755,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -2772,6 +2778,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
@@ -3119,7 +3126,7 @@
                                       feed_action_payload {
                                         [search.now.ui.action.FeedAction.feed_action_extension] {
                                           metadata {
-                                            type: NOT_INTERESTED_IN_TOPIC
+                                            type: NOT_INTERESTED_IN
                                             not_interested_in_data {
                                               undo_action {
                                                 confirmation_label: "You will not see this topic anymore"
@@ -3142,6 +3149,7 @@
                                                   }
                                                 }
                                               }
+                                              interest_type_value: 1
                                             }
                                           }
                                         }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/font_styles.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/font_styles.gcl.bin
index dd113fb..d6c2b71 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/font_styles.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/font_styles.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/font_styles.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/font_styles.gcl.textpb
index 4cda1e5..69e2861 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/font_styles.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/font_styles.gcl.textpb
@@ -90,60 +90,6 @@
           [search.now.ui.stream.PietContent.piet_content_extension] {
             frame {
               tag: "Font Card"
-              stylesheet {
-                styles {
-                  style_id: "style:now-card"
-                  color: 3724541952
-                  padding {
-                    top: 2
-                    bottom: 2
-                    start: 16
-                    end: 16
-                  }
-                }
-                styles {
-                  style_id: "font-regular"
-                  font {
-                    size: 16
-                    weight: REGULAR
-                  }
-                }
-                styles {
-                  style_id: "font-thin"
-                  font {
-                    size: 16
-                    weight: THIN
-                  }
-                }
-                styles {
-                  style_id: "font-light"
-                  font {
-                    size: 16
-                    weight: LIGHT
-                  }
-                }
-                styles {
-                  style_id: "font-medium"
-                  font {
-                    size: 16
-                    weight: MEDIUM
-                  }
-                }
-                styles {
-                  style_id: "font-bold"
-                  font {
-                    size: 16
-                    weight: BOLD
-                  }
-                }
-                styles {
-                  style_id: "font-black"
-                  font {
-                    size: 16
-                    weight: BLACK
-                  }
-                }
-              }
               style_references {
                 style_ids: "style:now-card"
               }
@@ -219,6 +165,62 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheets {
+                  styles {
+                    style_id: "style:now-card"
+                    color: 3724541952
+                    padding {
+                      top: 2
+                      bottom: 2
+                      start: 16
+                      end: 16
+                    }
+                  }
+                  styles {
+                    style_id: "font-regular"
+                    font {
+                      size: 16
+                      weight: REGULAR
+                    }
+                  }
+                  styles {
+                    style_id: "font-thin"
+                    font {
+                      size: 16
+                      weight: THIN
+                    }
+                  }
+                  styles {
+                    style_id: "font-light"
+                    font {
+                      size: 16
+                      weight: LIGHT
+                    }
+                  }
+                  styles {
+                    style_id: "font-medium"
+                    font {
+                      size: 16
+                      weight: MEDIUM
+                    }
+                  }
+                  styles {
+                    style_id: "font-bold"
+                    font {
+                      size: 16
+                      weight: BOLD
+                    }
+                  }
+                  styles {
+                    style_id: "font-black"
+                    font {
+                      size: 16
+                      weight: BLACK
+                    }
+                  }
+                }
+              }
             }
           }
         }
@@ -298,66 +300,6 @@
           [search.now.ui.stream.PietContent.piet_content_extension] {
             frame {
               tag: "Font Card"
-              stylesheet {
-                styles {
-                  style_id: "style:now-card"
-                  color: 2315255808
-                  padding {
-                    top: 2
-                    bottom: 2
-                    start: 16
-                    end: 16
-                  }
-                }
-                styles {
-                  style_id: "font-regular"
-                  font {
-                    size: 16
-                    weight: REGULAR
-                    italic: true
-                  }
-                }
-                styles {
-                  style_id: "font-thin"
-                  font {
-                    size: 16
-                    weight: THIN
-                    italic: true
-                  }
-                }
-                styles {
-                  style_id: "font-light"
-                  font {
-                    size: 16
-                    weight: LIGHT
-                    italic: true
-                  }
-                }
-                styles {
-                  style_id: "font-medium"
-                  font {
-                    size: 16
-                    weight: MEDIUM
-                    italic: true
-                  }
-                }
-                styles {
-                  style_id: "font-bold"
-                  font {
-                    size: 16
-                    weight: BOLD
-                    italic: true
-                  }
-                }
-                styles {
-                  style_id: "font-black"
-                  font {
-                    size: 16
-                    weight: BLACK
-                    italic: true
-                  }
-                }
-              }
               style_references {
                 style_ids: "style:now-card"
               }
@@ -433,6 +375,68 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheets {
+                  styles {
+                    style_id: "style:now-card"
+                    color: 2315255808
+                    padding {
+                      top: 2
+                      bottom: 2
+                      start: 16
+                      end: 16
+                    }
+                  }
+                  styles {
+                    style_id: "font-regular"
+                    font {
+                      size: 16
+                      weight: REGULAR
+                      italic: true
+                    }
+                  }
+                  styles {
+                    style_id: "font-thin"
+                    font {
+                      size: 16
+                      weight: THIN
+                      italic: true
+                    }
+                  }
+                  styles {
+                    style_id: "font-light"
+                    font {
+                      size: 16
+                      weight: LIGHT
+                      italic: true
+                    }
+                  }
+                  styles {
+                    style_id: "font-medium"
+                    font {
+                      size: 16
+                      weight: MEDIUM
+                      italic: true
+                    }
+                  }
+                  styles {
+                    style_id: "font-bold"
+                    font {
+                      size: 16
+                      weight: BOLD
+                      italic: true
+                    }
+                  }
+                  styles {
+                    style_id: "font-black"
+                    font {
+                      size: 16
+                      weight: BLACK
+                      italic: true
+                    }
+                  }
+                }
+              }
             }
           }
         }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/grid_images.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/grid_images.gcl.bin
index 436334e..9d888db 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/grid_images.gcl.bin
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/grid_images.gcl.bin
Binary files differ
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/grid_images.gcl.textpb b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/grid_images.gcl.textpb
index 4819f06..a497527 100755
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/grid_images.gcl.textpb
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/grid_images.gcl.textpb
@@ -164,7 +164,6 @@
               table: "piet-shared-state"
             }
             frame {
-              stylesheet_id: "basic-stylesheet"
               contents {
                 element {
                   text_element {
@@ -905,6 +904,9 @@
                   }
                 }
               }
+              stylesheets {
+                stylesheet_ids: "basic-stylesheet"
+              }
             }
           }
         }
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/host_bindings.gcl.bin b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/host_bindings.gcl.bin
new file mode 100755
index 0000000..ab49799
--- /dev/null
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/test_data/host_bindings.gcl.bin
Binary files differ