@lansweeper/data-platform-outbound-grpc 0.1.5 → 0.1.6

package/src/main/java/com/lansweeper/dp/outbound/v1/CatalogModel.java

@@ -16,10 +16,8 @@ private static final long serialVersionUID = 0L;
     super(builder);
   }
   private CatalogModel() {
-    key_ = "";
     deviceModel_ = "";
-    deviceType_ = "";
-    deviceModelCode_ = "";
+    deviceModelCode_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     manualUrl_ = "";
     faqUrl_ = "";
     lifecyleConfidence_ = "";
@@ -69,12 +67,6 @@ private static final long serialVersionUID = 0L;
             id_ = input.readInt64();
             break;
           }
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            key_ = s;
-            break;
-          }
           case 24: {
 
             makeId_ = input.readInt64();
@@ -86,147 +78,134 @@ private static final long serialVersionUID = 0L;
             deviceModel_ = s;
             break;
           }
-          case 42: {
-            java.lang.String s = input.readStringRequireUtf8();
+          case 40: {
             bitField0_ |= 0x00000001;
-            deviceType_ = s;
+            deviceTypeId_ = input.readInt64();
             break;
           }
           case 50: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000002;
-            deviceModelCode_ = s;
-            break;
-          }
-          case 56: {
-            bitField0_ |= 0x00000004;
-            overrideId_ = input.readInt64();
-            break;
-          }
-          case 64: {
-            bitField0_ |= 0x00000008;
-            osDefaultId_ = input.readInt64();
-            break;
-          }
-          case 72: {
-            bitField0_ |= 0x00000010;
-            osLatestId_ = input.readInt64();
+            if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              deviceModelCode_ = new com.google.protobuf.LazyStringArrayList();
+              mutable_bitField0_ |= 0x00000002;
+            }
+            deviceModelCode_.add(s);
             break;
           }
           case 80: {
-            bitField0_ |= 0x00000020;
+            bitField0_ |= 0x00000002;
             familyId_ = input.readInt64();
             break;
           }
           case 88: {
-            bitField0_ |= 0x00000040;
+            bitField0_ |= 0x00000004;
             isFamily_ = input.readBool();
             break;
           }
           case 98: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000080;
+            bitField0_ |= 0x00000008;
             manualUrl_ = s;
             break;
           }
           case 106: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00000100;
+            bitField0_ |= 0x00000010;
             faqUrl_ = s;
             break;
           }
           case 112: {
-            bitField0_ |= 0x00000200;
+            bitField0_ |= 0x00000020;
             releaseDate_ = input.readInt64();
             break;
           }
           case 120: {
-            bitField0_ |= 0x00000400;
+            bitField0_ |= 0x00000040;
             discDate_ = input.readInt64();
             break;
           }
           case 128: {
-            bitField0_ |= 0x00200000;
+            bitField0_ |= 0x00020000;
             lastUpdateTime_ = input.readInt64();
             break;
           }
           case 138: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00008000;
+            bitField0_ |= 0x00000800;
             shIftttHandle_ = s;
             break;
           }
           case 146: {
             java.lang.String s = input.readStringRequireUtf8();
-            if (!((mutable_bitField0_ & 0x00010000) != 0)) {
+            if (!((mutable_bitField0_ & 0x00002000) != 0)) {
               shGoogleAssLangs_ = new com.google.protobuf.LazyStringArrayList();
-              mutable_bitField0_ |= 0x00010000;
+              mutable_bitField0_ |= 0x00002000;
             }
             shGoogleAssLangs_.add(s);
             break;
           }
           case 154: {
             java.lang.String s = input.readStringRequireUtf8();
-            if (!((mutable_bitField0_ & 0x00020000) != 0)) {
+            if (!((mutable_bitField0_ & 0x00004000) != 0)) {
               shAlexaLangs_ = new com.google.protobuf.LazyStringArrayList();
-              mutable_bitField0_ |= 0x00020000;
+              mutable_bitField0_ |= 0x00004000;
             }
             shAlexaLangs_.add(s);
             break;
           }
           case 162: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00010000;
+            bitField0_ |= 0x00001000;
             shHassHandle_ = s;
             break;
           }
           case 168: {
-            bitField0_ |= 0x00020000;
+            bitField0_ |= 0x00002000;
             shAppleHomeKit_ = input.readBool();
             break;
           }
           case 178: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00040000;
+            bitField0_ |= 0x00004000;
             shOpenHabHandle_ = s;
             break;
           }
-          case 185: {
-            bitField0_ |= 0x00100000;
-            spreadInType_ = input.readDouble();
+          case 184: {
+            bitField0_ |= 0x00010000;
+            popularity_ = input.readInt32();
             break;
           }
           case 194: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00002000;
+            bitField0_ |= 0x00000200;
             priceClass_ = s;
             break;
           }
           case 202: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00004000;
+            bitField0_ |= 0x00000400;
             productClass_ = s;
             break;
           }
           case 208: {
-            bitField0_ |= 0x00000800;
+            bitField0_ |= 0x00000080;
             eosDate_ = input.readInt64();
             break;
           }
           case 216: {
-            bitField0_ |= 0x00400000;
+            bitField0_ |= 0x00040000;
             matchScore_ = input.readInt32();
             break;
           }
           case 226: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00080000;
+            bitField0_ |= 0x00008000;
             nistCpe_ = s;
             break;
           }
           case 234: {
             java.lang.String s = input.readStringRequireUtf8();
-            bitField0_ |= 0x00001000;
+            bitField0_ |= 0x00000100;
             lifecyleConfidence_ = s;
             break;
           }
@@ -245,10 +224,13 @@ private static final long serialVersionUID = 0L;
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
-      if (((mutable_bitField0_ & 0x00010000) != 0)) {
+      if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        deviceModelCode_ = deviceModelCode_.getUnmodifiableView();
+      }
+      if (((mutable_bitField0_ & 0x00002000) != 0)) {
         shGoogleAssLangs_ = shGoogleAssLangs_.getUnmodifiableView();
       }
-      if (((mutable_bitField0_ & 0x00020000) != 0)) {
+      if (((mutable_bitField0_ & 0x00004000) != 0)) {
         shAlexaLangs_ = shAlexaLangs_.getUnmodifiableView();
       }
       this.unknownFields = unknownFields.build();
@@ -280,44 +262,6 @@ private static final long serialVersionUID = 0L;
     return id_;
   }
 
-  public static final int KEY_FIELD_NUMBER = 2;
-  private volatile java.lang.Object key_;
-  /**
-   * <code>string key = 2;</code>
-   * @return The key.
-   */
-  @java.lang.Override
-  public java.lang.String getKey() {
-    java.lang.Object ref = key_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      key_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string key = 2;</code>
-   * @return The bytes for key.
-   */
-  @java.lang.Override
-  public com.google.protobuf.ByteString
-      getKeyBytes() {
-    java.lang.Object ref = key_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      key_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
   public static final int MAKE_ID_FIELD_NUMBER = 3;
   private long makeId_;
   /**
@@ -367,153 +311,58 @@ private static final long serialVersionUID = 0L;
     }
   }
 
-  public static final int DEVICE_TYPE_FIELD_NUMBER = 5;
-  private volatile java.lang.Object deviceType_;
+  public static final int DEVICE_TYPE_ID_FIELD_NUMBER = 5;
+  private long deviceTypeId_;
   /**
-   * <code>string device_type = 5;</code>
-   * @return Whether the deviceType field is set.
+   * <code>int64 device_type_id = 5;</code>
+   * @return Whether the deviceTypeId field is set.
    */
   @java.lang.Override
-  public boolean hasDeviceType() {
+  public boolean hasDeviceTypeId() {
     return ((bitField0_ & 0x00000001) != 0);
   }
   /**
-   * <code>string device_type = 5;</code>
-   * @return The deviceType.
+   * <code>int64 device_type_id = 5;</code>
+   * @return The deviceTypeId.
    */
   @java.lang.Override
-  public java.lang.String getDeviceType() {
-    java.lang.Object ref = deviceType_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      deviceType_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string device_type = 5;</code>
-   * @return The bytes for deviceType.
-   */
-  @java.lang.Override
-  public com.google.protobuf.ByteString
-      getDeviceTypeBytes() {
-    java.lang.Object ref = deviceType_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      deviceType_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
+  public long getDeviceTypeId() {
+    return deviceTypeId_;
   }
 
   public static final int DEVICE_MODEL_CODE_FIELD_NUMBER = 6;
-  private volatile java.lang.Object deviceModelCode_;
-  /**
-   * <code>string device_model_code = 6;</code>
-   * @return Whether the deviceModelCode field is set.
-   */
-  @java.lang.Override
-  public boolean hasDeviceModelCode() {
-    return ((bitField0_ & 0x00000002) != 0);
-  }
-  /**
-   * <code>string device_model_code = 6;</code>
-   * @return The deviceModelCode.
-   */
-  @java.lang.Override
-  public java.lang.String getDeviceModelCode() {
-    java.lang.Object ref = deviceModelCode_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = 
-          (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      deviceModelCode_ = s;
-      return s;
-    }
-  }
-  /**
-   * <code>string device_model_code = 6;</code>
-   * @return The bytes for deviceModelCode.
-   */
-  @java.lang.Override
-  public com.google.protobuf.ByteString
-      getDeviceModelCodeBytes() {
-    java.lang.Object ref = deviceModelCode_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b = 
-          com.google.protobuf.ByteString.copyFromUtf8(
-              (java.lang.String) ref);
-      deviceModelCode_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int OVERRIDE_ID_FIELD_NUMBER = 7;
-  private long overrideId_;
+  private com.google.protobuf.LazyStringList deviceModelCode_;
   /**
-   * <code>int64 override_id = 7;</code>
-   * @return Whether the overrideId field is set.
+   * <code>repeated string device_model_code = 6;</code>
+   * @return A list containing the deviceModelCode.
    */
-  @java.lang.Override
-  public boolean hasOverrideId() {
-    return ((bitField0_ & 0x00000004) != 0);
-  }
-  /**
-   * <code>int64 override_id = 7;</code>
-   * @return The overrideId.
-   */
-  @java.lang.Override
-  public long getOverrideId() {
-    return overrideId_;
-  }
-
-  public static final int OS_DEFAULT_ID_FIELD_NUMBER = 8;
-  private long osDefaultId_;
-  /**
-   * <code>int64 os_default_id = 8;</code>
-   * @return Whether the osDefaultId field is set.
-   */
-  @java.lang.Override
-  public boolean hasOsDefaultId() {
-    return ((bitField0_ & 0x00000008) != 0);
+  public com.google.protobuf.ProtocolStringList
+      getDeviceModelCodeList() {
+    return deviceModelCode_;
   }
   /**
-   * <code>int64 os_default_id = 8;</code>
-   * @return The osDefaultId.
+   * <code>repeated string device_model_code = 6;</code>
+   * @return The count of deviceModelCode.
    */
-  @java.lang.Override
-  public long getOsDefaultId() {
-    return osDefaultId_;
+  public int getDeviceModelCodeCount() {
+    return deviceModelCode_.size();
   }
-
-  public static final int OS_LATEST_ID_FIELD_NUMBER = 9;
-  private long osLatestId_;
   /**
-   * <code>int64 os_latest_id = 9;</code>
-   * @return Whether the osLatestId field is set.
+   * <code>repeated string device_model_code = 6;</code>
+   * @param index The index of the element to return.
+   * @return The deviceModelCode at the given index.
    */
-  @java.lang.Override
-  public boolean hasOsLatestId() {
-    return ((bitField0_ & 0x00000010) != 0);
+  public java.lang.String getDeviceModelCode(int index) {
+    return deviceModelCode_.get(index);
   }
   /**
-   * <code>int64 os_latest_id = 9;</code>
-   * @return The osLatestId.
+   * <code>repeated string device_model_code = 6;</code>
+   * @param index The index of the value to return.
+   * @return The bytes of the deviceModelCode at the given index.
    */
-  @java.lang.Override
-  public long getOsLatestId() {
-    return osLatestId_;
+  public com.google.protobuf.ByteString
+      getDeviceModelCodeBytes(int index) {
+    return deviceModelCode_.getByteString(index);
   }
 
   public static final int FAMILY_ID_FIELD_NUMBER = 10;
@@ -524,7 +373,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasFamilyId() {
-    return ((bitField0_ & 0x00000020) != 0);
+    return ((bitField0_ & 0x00000002) != 0);
   }
   /**
    * <code>int64 family_id = 10;</code>
@@ -543,7 +392,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasIsFamily() {
-    return ((bitField0_ & 0x00000040) != 0);
+    return ((bitField0_ & 0x00000004) != 0);
   }
   /**
    * <code>bool is_family = 11;</code>
@@ -562,7 +411,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasManualUrl() {
-    return ((bitField0_ & 0x00000080) != 0);
+    return ((bitField0_ & 0x00000008) != 0);
   }
   /**
    * <code>string manual_url = 12;</code>
@@ -608,7 +457,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasFaqUrl() {
-    return ((bitField0_ & 0x00000100) != 0);
+    return ((bitField0_ & 0x00000010) != 0);
   }
   /**
    * <code>string faq_url = 13;</code>
@@ -654,7 +503,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasReleaseDate() {
-    return ((bitField0_ & 0x00000200) != 0);
+    return ((bitField0_ & 0x00000020) != 0);
   }
   /**
    * <code>int64 release_date = 14;</code>
@@ -673,7 +522,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasDiscDate() {
-    return ((bitField0_ & 0x00000400) != 0);
+    return ((bitField0_ & 0x00000040) != 0);
   }
   /**
    * <code>int64 disc_date = 15;</code>
@@ -692,7 +541,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasEosDate() {
-    return ((bitField0_ & 0x00000800) != 0);
+    return ((bitField0_ & 0x00000080) != 0);
   }
   /**
    * <code>int64 eos_date = 26;</code>
@@ -711,7 +560,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasLifecyleConfidence() {
-    return ((bitField0_ & 0x00001000) != 0);
+    return ((bitField0_ & 0x00000100) != 0);
   }
   /**
    * <code>string lifecyle_confidence = 29;</code>
@@ -757,7 +606,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasPriceClass() {
-    return ((bitField0_ & 0x00002000) != 0);
+    return ((bitField0_ & 0x00000200) != 0);
   }
   /**
    * <code>string price_class = 24;</code>
@@ -803,7 +652,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasProductClass() {
-    return ((bitField0_ & 0x00004000) != 0);
+    return ((bitField0_ & 0x00000400) != 0);
   }
   /**
    * <code>string product_class = 25;</code>
@@ -849,7 +698,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasShIftttHandle() {
-    return ((bitField0_ & 0x00008000) != 0);
+    return ((bitField0_ & 0x00000800) != 0);
   }
   /**
    * <code>string sh_ifttt_handle = 17;</code>
@@ -965,7 +814,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasShHassHandle() {
-    return ((bitField0_ & 0x00010000) != 0);
+    return ((bitField0_ & 0x00001000) != 0);
   }
   /**
    * <code>string sh_hass_handle = 20;</code>
@@ -1011,7 +860,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasShAppleHomeKit() {
-    return ((bitField0_ & 0x00020000) != 0);
+    return ((bitField0_ & 0x00002000) != 0);
   }
   /**
    * <code>bool sh_apple_home_kit = 21;</code>
@@ -1030,7 +879,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasShOpenHabHandle() {
-    return ((bitField0_ & 0x00040000) != 0);
+    return ((bitField0_ & 0x00004000) != 0);
   }
   /**
    * <code>string sh_open_hab_handle = 22;</code>
@@ -1076,7 +925,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasNistCpe() {
-    return ((bitField0_ & 0x00080000) != 0);
+    return ((bitField0_ & 0x00008000) != 0);
   }
   /**
    * <code>string nist_cpe = 28;</code>
@@ -1114,23 +963,23 @@ private static final long serialVersionUID = 0L;
     }
   }
 
-  public static final int SPREAD_IN_TYPE_FIELD_NUMBER = 23;
-  private double spreadInType_;
+  public static final int POPULARITY_FIELD_NUMBER = 23;
+  private int popularity_;
   /**
-   * <code>double spread_in_type = 23;</code>
-   * @return Whether the spreadInType field is set.
+   * <code>int32 popularity = 23;</code>
+   * @return Whether the popularity field is set.
    */
   @java.lang.Override
-  public boolean hasSpreadInType() {
-    return ((bitField0_ & 0x00100000) != 0);
+  public boolean hasPopularity() {
+    return ((bitField0_ & 0x00010000) != 0);
   }
   /**
-   * <code>double spread_in_type = 23;</code>
-   * @return The spreadInType.
+   * <code>int32 popularity = 23;</code>
+   * @return The popularity.
    */
   @java.lang.Override
-  public double getSpreadInType() {
-    return spreadInType_;
+  public int getPopularity() {
+    return popularity_;
   }
 
   public static final int LAST_UPDATE_TIME_FIELD_NUMBER = 16;
@@ -1141,7 +990,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasLastUpdateTime() {
-    return ((bitField0_ & 0x00200000) != 0);
+    return ((bitField0_ & 0x00020000) != 0);
   }
   /**
    * <code>int64 last_update_time = 16;</code>
@@ -1164,7 +1013,7 @@ private static final long serialVersionUID = 0L;
    */
   @java.lang.Override
   public boolean hasMatchScore() {
-    return ((bitField0_ & 0x00400000) != 0);
+    return ((bitField0_ & 0x00040000) != 0);
   }
   /**
    * <pre>
@@ -1196,9 +1045,6 @@ private static final long serialVersionUID = 0L;
     if (id_ != 0L) {
       output.writeInt64(1, id_);
     }
-    if (!getKeyBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 2, key_);
-    }
     if (makeId_ != 0L) {
       output.writeInt64(3, makeId_);
     }
@@ -1206,42 +1052,33 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, deviceModel_);
     }
     if (((bitField0_ & 0x00000001) != 0)) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 5, deviceType_);
+      output.writeInt64(5, deviceTypeId_);
     }
-    if (((bitField0_ & 0x00000002) != 0)) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 6, deviceModelCode_);
-    }
-    if (((bitField0_ & 0x00000004) != 0)) {
-      output.writeInt64(7, overrideId_);
-    }
-    if (((bitField0_ & 0x00000008) != 0)) {
-      output.writeInt64(8, osDefaultId_);
-    }
-    if (((bitField0_ & 0x00000010) != 0)) {
-      output.writeInt64(9, osLatestId_);
+    for (int i = 0; i < deviceModelCode_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 6, deviceModelCode_.getRaw(i));
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       output.writeInt64(10, familyId_);
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       output.writeBool(11, isFamily_);
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 12, manualUrl_);
     }
-    if (((bitField0_ & 0x00000100) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 13, faqUrl_);
     }
-    if (((bitField0_ & 0x00000200) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       output.writeInt64(14, releaseDate_);
     }
-    if (((bitField0_ & 0x00000400) != 0)) {
+    if (((bitField0_ & 0x00000040) != 0)) {
       output.writeInt64(15, discDate_);
     }
-    if (((bitField0_ & 0x00200000) != 0)) {
+    if (((bitField0_ & 0x00020000) != 0)) {
       output.writeInt64(16, lastUpdateTime_);
     }
-    if (((bitField0_ & 0x00008000) != 0)) {
+    if (((bitField0_ & 0x00000800) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 17, shIftttHandle_);
     }
     for (int i = 0; i < shGoogleAssLangs_.size(); i++) {
@@ -1250,34 +1087,34 @@ private static final long serialVersionUID = 0L;
     for (int i = 0; i < shAlexaLangs_.size(); i++) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 19, shAlexaLangs_.getRaw(i));
     }
-    if (((bitField0_ & 0x00010000) != 0)) {
+    if (((bitField0_ & 0x00001000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 20, shHassHandle_);
     }
-    if (((bitField0_ & 0x00020000) != 0)) {
+    if (((bitField0_ & 0x00002000) != 0)) {
       output.writeBool(21, shAppleHomeKit_);
     }
-    if (((bitField0_ & 0x00040000) != 0)) {
+    if (((bitField0_ & 0x00004000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 22, shOpenHabHandle_);
     }
-    if (((bitField0_ & 0x00100000) != 0)) {
-      output.writeDouble(23, spreadInType_);
+    if (((bitField0_ & 0x00010000) != 0)) {
+      output.writeInt32(23, popularity_);
     }
-    if (((bitField0_ & 0x00002000) != 0)) {
+    if (((bitField0_ & 0x00000200) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 24, priceClass_);
     }
-    if (((bitField0_ & 0x00004000) != 0)) {
+    if (((bitField0_ & 0x00000400) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 25, productClass_);
     }
-    if (((bitField0_ & 0x00000800) != 0)) {
+    if (((bitField0_ & 0x00000080) != 0)) {
       output.writeInt64(26, eosDate_);
     }
-    if (((bitField0_ & 0x00400000) != 0)) {
+    if (((bitField0_ & 0x00040000) != 0)) {
       output.writeInt32(27, matchScore_);
     }
-    if (((bitField0_ & 0x00080000) != 0)) {
+    if (((bitField0_ & 0x00008000) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 28, nistCpe_);
     }
-    if (((bitField0_ & 0x00001000) != 0)) {
+    if (((bitField0_ & 0x00000100) != 0)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 29, lifecyleConfidence_);
     }
     unknownFields.writeTo(output);
@@ -1293,9 +1130,6 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(1, id_);
     }
-    if (!getKeyBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, key_);
-    }
     if (makeId_ != 0L) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(3, makeId_);
@@ -1304,50 +1138,44 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, deviceModel_);
     }
     if (((bitField0_ & 0x00000001) != 0)) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, deviceType_);
-    }
-    if (((bitField0_ & 0x00000002) != 0)) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, deviceModelCode_);
-    }
-    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(7, overrideId_);
+        .computeInt64Size(5, deviceTypeId_);
     }
-    if (((bitField0_ & 0x00000008) != 0)) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(8, osDefaultId_);
-    }
-    if (((bitField0_ & 0x00000010) != 0)) {
-      size += com.google.protobuf.CodedOutputStream
-        .computeInt64Size(9, osLatestId_);
+    {
+      int dataSize = 0;
+      for (int i = 0; i < deviceModelCode_.size(); i++) {
+        dataSize += computeStringSizeNoTag(deviceModelCode_.getRaw(i));
+      }
+      size += dataSize;
+      size += 1 * getDeviceModelCodeList().size();
     }
-    if (((bitField0_ & 0x00000020) != 0)) {
+    if (((bitField0_ & 0x00000002) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(10, familyId_);
     }
-    if (((bitField0_ & 0x00000040) != 0)) {
+    if (((bitField0_ & 0x00000004) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(11, isFamily_);
     }
-    if (((bitField0_ & 0x00000080) != 0)) {
+    if (((bitField0_ & 0x00000008) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, manualUrl_);
     }
-    if (((bitField0_ & 0x00000100) != 0)) {
+    if (((bitField0_ & 0x00000010) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, faqUrl_);
     }
-    if (((bitField0_ & 0x00000200) != 0)) {
+    if (((bitField0_ & 0x00000020) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(14, releaseDate_);
     }
-    if (((bitField0_ & 0x00000400) != 0)) {
+    if (((bitField0_ & 0x00000040) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(15, discDate_);
     }
-    if (((bitField0_ & 0x00200000) != 0)) {
+    if (((bitField0_ & 0x00020000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(16, lastUpdateTime_);
     }
-    if (((bitField0_ & 0x00008000) != 0)) {
+    if (((bitField0_ & 0x00000800) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, shIftttHandle_);
     }
     {
@@ -1366,38 +1194,38 @@ private static final long serialVersionUID = 0L;
       size += dataSize;
       size += 2 * getShAlexaLangsList().size();
     }
-    if (((bitField0_ & 0x00010000) != 0)) {
+    if (((bitField0_ & 0x00001000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(20, shHassHandle_);
     }
-    if (((bitField0_ & 0x00020000) != 0)) {
+    if (((bitField0_ & 0x00002000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(21, shAppleHomeKit_);
     }
-    if (((bitField0_ & 0x00040000) != 0)) {
+    if (((bitField0_ & 0x00004000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(22, shOpenHabHandle_);
     }
-    if (((bitField0_ & 0x00100000) != 0)) {
+    if (((bitField0_ & 0x00010000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
-        .computeDoubleSize(23, spreadInType_);
+        .computeInt32Size(23, popularity_);
     }
-    if (((bitField0_ & 0x00002000) != 0)) {
+    if (((bitField0_ & 0x00000200) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(24, priceClass_);
     }
-    if (((bitField0_ & 0x00004000) != 0)) {
+    if (((bitField0_ & 0x00000400) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(25, productClass_);
     }
-    if (((bitField0_ & 0x00000800) != 0)) {
+    if (((bitField0_ & 0x00000080) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(26, eosDate_);
     }
-    if (((bitField0_ & 0x00400000) != 0)) {
+    if (((bitField0_ & 0x00040000) != 0)) {
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(27, matchScore_);
     }
-    if (((bitField0_ & 0x00080000) != 0)) {
+    if (((bitField0_ & 0x00008000) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(28, nistCpe_);
     }
-    if (((bitField0_ & 0x00001000) != 0)) {
+    if (((bitField0_ & 0x00000100) != 0)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(29, lifecyleConfidence_);
     }
     size += unknownFields.getSerializedSize();
@@ -1417,37 +1245,17 @@ private static final long serialVersionUID = 0L;
 
     if (getId()
         != other.getId()) return false;
-    if (!getKey()
-        .equals(other.getKey())) return false;
     if (getMakeId()
         != other.getMakeId()) return false;
     if (!getDeviceModel()
         .equals(other.getDeviceModel())) return false;
-    if (hasDeviceType() != other.hasDeviceType()) return false;
-    if (hasDeviceType()) {
-      if (!getDeviceType()
-          .equals(other.getDeviceType())) return false;
-    }
-    if (hasDeviceModelCode() != other.hasDeviceModelCode()) return false;
-    if (hasDeviceModelCode()) {
-      if (!getDeviceModelCode()
-          .equals(other.getDeviceModelCode())) return false;
-    }
-    if (hasOverrideId() != other.hasOverrideId()) return false;
-    if (hasOverrideId()) {
-      if (getOverrideId()
-          != other.getOverrideId()) return false;
-    }
-    if (hasOsDefaultId() != other.hasOsDefaultId()) return false;
-    if (hasOsDefaultId()) {
-      if (getOsDefaultId()
-          != other.getOsDefaultId()) return false;
-    }
-    if (hasOsLatestId() != other.hasOsLatestId()) return false;
-    if (hasOsLatestId()) {
-      if (getOsLatestId()
-          != other.getOsLatestId()) return false;
+    if (hasDeviceTypeId() != other.hasDeviceTypeId()) return false;
+    if (hasDeviceTypeId()) {
+      if (getDeviceTypeId()
+          != other.getDeviceTypeId()) return false;
     }
+    if (!getDeviceModelCodeList()
+        .equals(other.getDeviceModelCodeList())) return false;
     if (hasFamilyId() != other.hasFamilyId()) return false;
     if (hasFamilyId()) {
       if (getFamilyId()
@@ -1527,11 +1335,10 @@ private static final long serialVersionUID = 0L;
       if (!getNistCpe()
           .equals(other.getNistCpe())) return false;
     }
-    if (hasSpreadInType() != other.hasSpreadInType()) return false;
-    if (hasSpreadInType()) {
-      if (java.lang.Double.doubleToLongBits(getSpreadInType())
-          != java.lang.Double.doubleToLongBits(
-              other.getSpreadInType())) return false;
+    if (hasPopularity() != other.hasPopularity()) return false;
+    if (hasPopularity()) {
+      if (getPopularity()
+          != other.getPopularity()) return false;
     }
     if (hasLastUpdateTime() != other.hasLastUpdateTime()) return false;
     if (hasLastUpdateTime()) {
@@ -1557,35 +1364,19 @@ private static final long serialVersionUID = 0L;
     hash = (37 * hash) + ID_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
         getId());
-    hash = (37 * hash) + KEY_FIELD_NUMBER;
-    hash = (53 * hash) + getKey().hashCode();
     hash = (37 * hash) + MAKE_ID_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
         getMakeId());
     hash = (37 * hash) + DEVICE_MODEL_FIELD_NUMBER;
     hash = (53 * hash) + getDeviceModel().hashCode();
-    if (hasDeviceType()) {
-      hash = (37 * hash) + DEVICE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getDeviceType().hashCode();
-    }
-    if (hasDeviceModelCode()) {
-      hash = (37 * hash) + DEVICE_MODEL_CODE_FIELD_NUMBER;
-      hash = (53 * hash) + getDeviceModelCode().hashCode();
-    }
-    if (hasOverrideId()) {
-      hash = (37 * hash) + OVERRIDE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getOverrideId());
-    }
-    if (hasOsDefaultId()) {
-      hash = (37 * hash) + OS_DEFAULT_ID_FIELD_NUMBER;
+    if (hasDeviceTypeId()) {
+      hash = (37 * hash) + DEVICE_TYPE_ID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getOsDefaultId());
+          getDeviceTypeId());
     }
-    if (hasOsLatestId()) {
-      hash = (37 * hash) + OS_LATEST_ID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getOsLatestId());
+    if (getDeviceModelCodeCount() > 0) {
+      hash = (37 * hash) + DEVICE_MODEL_CODE_FIELD_NUMBER;
+      hash = (53 * hash) + getDeviceModelCodeList().hashCode();
     }
     if (hasFamilyId()) {
       hash = (37 * hash) + FAMILY_ID_FIELD_NUMBER;
@@ -1661,10 +1452,9 @@ private static final long serialVersionUID = 0L;
       hash = (37 * hash) + NIST_CPE_FIELD_NUMBER;
       hash = (53 * hash) + getNistCpe().hashCode();
     }
-    if (hasSpreadInType()) {
-      hash = (37 * hash) + SPREAD_IN_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          java.lang.Double.doubleToLongBits(getSpreadInType()));
+    if (hasPopularity()) {
+      hash = (37 * hash) + POPULARITY_FIELD_NUMBER;
+      hash = (53 * hash) + getPopularity();
     }
     if (hasLastUpdateTime()) {
       hash = (37 * hash) + LAST_UPDATE_TIME_FIELD_NUMBER;
@@ -1810,62 +1600,54 @@ private static final long serialVersionUID = 0L;
       super.clear();
       id_ = 0L;
 
-      key_ = "";
-
       makeId_ = 0L;
 
       deviceModel_ = "";
 
-      deviceType_ = "";
+      deviceTypeId_ = 0L;
       bitField0_ = (bitField0_ & ~0x00000001);
-      deviceModelCode_ = "";
+      deviceModelCode_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00000002);
-      overrideId_ = 0L;
+      familyId_ = 0L;
       bitField0_ = (bitField0_ & ~0x00000004);
-      osDefaultId_ = 0L;
+      isFamily_ = false;
       bitField0_ = (bitField0_ & ~0x00000008);
-      osLatestId_ = 0L;
+      manualUrl_ = "";
       bitField0_ = (bitField0_ & ~0x00000010);
-      familyId_ = 0L;
+      faqUrl_ = "";
       bitField0_ = (bitField0_ & ~0x00000020);
-      isFamily_ = false;
+      releaseDate_ = 0L;
       bitField0_ = (bitField0_ & ~0x00000040);
-      manualUrl_ = "";
+      discDate_ = 0L;
       bitField0_ = (bitField0_ & ~0x00000080);
-      faqUrl_ = "";
+      eosDate_ = 0L;
       bitField0_ = (bitField0_ & ~0x00000100);
-      releaseDate_ = 0L;
+      lifecyleConfidence_ = "";
       bitField0_ = (bitField0_ & ~0x00000200);
-      discDate_ = 0L;
+      priceClass_ = "";
       bitField0_ = (bitField0_ & ~0x00000400);
-      eosDate_ = 0L;
+      productClass_ = "";
       bitField0_ = (bitField0_ & ~0x00000800);
-      lifecyleConfidence_ = "";
+      shIftttHandle_ = "";
       bitField0_ = (bitField0_ & ~0x00001000);
-      priceClass_ = "";
+      shGoogleAssLangs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00002000);
-      productClass_ = "";
+      shAlexaLangs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       bitField0_ = (bitField0_ & ~0x00004000);
-      shIftttHandle_ = "";
+      shHassHandle_ = "";
       bitField0_ = (bitField0_ & ~0x00008000);
-      shGoogleAssLangs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      shAppleHomeKit_ = false;
       bitField0_ = (bitField0_ & ~0x00010000);
-      shAlexaLangs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      shOpenHabHandle_ = "";
       bitField0_ = (bitField0_ & ~0x00020000);
-      shHassHandle_ = "";
+      nistCpe_ = "";
       bitField0_ = (bitField0_ & ~0x00040000);
-      shAppleHomeKit_ = false;
+      popularity_ = 0;
       bitField0_ = (bitField0_ & ~0x00080000);
-      shOpenHabHandle_ = "";
-      bitField0_ = (bitField0_ & ~0x00100000);
-      nistCpe_ = "";
-      bitField0_ = (bitField0_ & ~0x00200000);
-      spreadInType_ = 0D;
-      bitField0_ = (bitField0_ & ~0x00400000);
       lastUpdateTime_ = 0L;
-      bitField0_ = (bitField0_ & ~0x00800000);
+      bitField0_ = (bitField0_ & ~0x00100000);
       matchScore_ = 0;
-      bitField0_ = (bitField0_ & ~0x01000000);
+      bitField0_ = (bitField0_ & ~0x00200000);
       return this;
     }
 
@@ -1895,110 +1677,98 @@ private static final long serialVersionUID = 0L;
       int from_bitField0_ = bitField0_;
       int to_bitField0_ = 0;
       result.id_ = id_;
-      result.key_ = key_;
       result.makeId_ = makeId_;
       result.deviceModel_ = deviceModel_;
       if (((from_bitField0_ & 0x00000001) != 0)) {
+        result.deviceTypeId_ = deviceTypeId_;
         to_bitField0_ |= 0x00000001;
       }
-      result.deviceType_ = deviceType_;
-      if (((from_bitField0_ & 0x00000002) != 0)) {
-        to_bitField0_ |= 0x00000002;
+      if (((bitField0_ & 0x00000002) != 0)) {
+        deviceModelCode_ = deviceModelCode_.getUnmodifiableView();
+        bitField0_ = (bitField0_ & ~0x00000002);
       }
       result.deviceModelCode_ = deviceModelCode_;
       if (((from_bitField0_ & 0x00000004) != 0)) {
-        result.overrideId_ = overrideId_;
-        to_bitField0_ |= 0x00000004;
-      }
-      if (((from_bitField0_ & 0x00000008) != 0)) {
-        result.osDefaultId_ = osDefaultId_;
-        to_bitField0_ |= 0x00000008;
-      }
-      if (((from_bitField0_ & 0x00000010) != 0)) {
-        result.osLatestId_ = osLatestId_;
-        to_bitField0_ |= 0x00000010;
-      }
-      if (((from_bitField0_ & 0x00000020) != 0)) {
         result.familyId_ = familyId_;
-        to_bitField0_ |= 0x00000020;
+        to_bitField0_ |= 0x00000002;
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
+      if (((from_bitField0_ & 0x00000008) != 0)) {
         result.isFamily_ = isFamily_;
-        to_bitField0_ |= 0x00000040;
+        to_bitField0_ |= 0x00000004;
       }
-      if (((from_bitField0_ & 0x00000080) != 0)) {
-        to_bitField0_ |= 0x00000080;
+      if (((from_bitField0_ & 0x00000010) != 0)) {
+        to_bitField0_ |= 0x00000008;
       }
       result.manualUrl_ = manualUrl_;
-      if (((from_bitField0_ & 0x00000100) != 0)) {
-        to_bitField0_ |= 0x00000100;
+      if (((from_bitField0_ & 0x00000020) != 0)) {
+        to_bitField0_ |= 0x00000010;
       }
       result.faqUrl_ = faqUrl_;
-      if (((from_bitField0_ & 0x00000200) != 0)) {
+      if (((from_bitField0_ & 0x00000040) != 0)) {
         result.releaseDate_ = releaseDate_;
-        to_bitField0_ |= 0x00000200;
+        to_bitField0_ |= 0x00000020;
       }
-      if (((from_bitField0_ & 0x00000400) != 0)) {
+      if (((from_bitField0_ & 0x00000080) != 0)) {
         result.discDate_ = discDate_;
-        to_bitField0_ |= 0x00000400;
+        to_bitField0_ |= 0x00000040;
       }
-      if (((from_bitField0_ & 0x00000800) != 0)) {
+      if (((from_bitField0_ & 0x00000100) != 0)) {
         result.eosDate_ = eosDate_;
-        to_bitField0_ |= 0x00000800;
+        to_bitField0_ |= 0x00000080;
       }
-      if (((from_bitField0_ & 0x00001000) != 0)) {
-        to_bitField0_ |= 0x00001000;
+      if (((from_bitField0_ & 0x00000200) != 0)) {
+        to_bitField0_ |= 0x00000100;
       }
       result.lifecyleConfidence_ = lifecyleConfidence_;
-      if (((from_bitField0_ & 0x00002000) != 0)) {
-        to_bitField0_ |= 0x00002000;
+      if (((from_bitField0_ & 0x00000400) != 0)) {
+        to_bitField0_ |= 0x00000200;
       }
       result.priceClass_ = priceClass_;
-      if (((from_bitField0_ & 0x00004000) != 0)) {
-        to_bitField0_ |= 0x00004000;
+      if (((from_bitField0_ & 0x00000800) != 0)) {
+        to_bitField0_ |= 0x00000400;
       }
       result.productClass_ = productClass_;
-      if (((from_bitField0_ & 0x00008000) != 0)) {
-        to_bitField0_ |= 0x00008000;
+      if (((from_bitField0_ & 0x00001000) != 0)) {
+        to_bitField0_ |= 0x00000800;
       }
       result.shIftttHandle_ = shIftttHandle_;
-      if (((bitField0_ & 0x00010000) != 0)) {
+      if (((bitField0_ & 0x00002000) != 0)) {
         shGoogleAssLangs_ = shGoogleAssLangs_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00010000);
+        bitField0_ = (bitField0_ & ~0x00002000);
       }
       result.shGoogleAssLangs_ = shGoogleAssLangs_;
-      if (((bitField0_ & 0x00020000) != 0)) {
+      if (((bitField0_ & 0x00004000) != 0)) {
         shAlexaLangs_ = shAlexaLangs_.getUnmodifiableView();
-        bitField0_ = (bitField0_ & ~0x00020000);
+        bitField0_ = (bitField0_ & ~0x00004000);
       }
       result.shAlexaLangs_ = shAlexaLangs_;
-      if (((from_bitField0_ & 0x00040000) != 0)) {
-        to_bitField0_ |= 0x00010000;
+      if (((from_bitField0_ & 0x00008000) != 0)) {
+        to_bitField0_ |= 0x00001000;
       }
       result.shHassHandle_ = shHassHandle_;
-      if (((from_bitField0_ & 0x00080000) != 0)) {
+      if (((from_bitField0_ & 0x00010000) != 0)) {
         result.shAppleHomeKit_ = shAppleHomeKit_;
-        to_bitField0_ |= 0x00020000;
+        to_bitField0_ |= 0x00002000;
       }
-      if (((from_bitField0_ & 0x00100000) != 0)) {
-        to_bitField0_ |= 0x00040000;
+      if (((from_bitField0_ & 0x00020000) != 0)) {
+        to_bitField0_ |= 0x00004000;
       }
       result.shOpenHabHandle_ = shOpenHabHandle_;
-      if (((from_bitField0_ & 0x00200000) != 0)) {
-        to_bitField0_ |= 0x00080000;
+      if (((from_bitField0_ & 0x00040000) != 0)) {
+        to_bitField0_ |= 0x00008000;
       }
       result.nistCpe_ = nistCpe_;
-      if (((from_bitField0_ & 0x00400000) != 0)) {
-        result.spreadInType_ = spreadInType_;
-        to_bitField0_ |= 0x00100000;
+      if (((from_bitField0_ & 0x00080000) != 0)) {
+        result.popularity_ = popularity_;
+        to_bitField0_ |= 0x00010000;
       }
-      if (((from_bitField0_ & 0x00800000) != 0)) {
+      if (((from_bitField0_ & 0x00100000) != 0)) {
         result.lastUpdateTime_ = lastUpdateTime_;
-        to_bitField0_ |= 0x00200000;
+        to_bitField0_ |= 0x00020000;
       }
-      if (((from_bitField0_ & 0x01000000) != 0)) {
+      if (((from_bitField0_ & 0x00200000) != 0)) {
         result.matchScore_ = matchScore_;
-        to_bitField0_ |= 0x00400000;
+        to_bitField0_ |= 0x00040000;
       }
       result.bitField0_ = to_bitField0_;
       onBuilt();
@@ -2052,10 +1822,6 @@ private static final long serialVersionUID = 0L;
       if (other.getId() != 0L) {
         setId(other.getId());
       }
-      if (!other.getKey().isEmpty()) {
-        key_ = other.key_;
-        onChanged();
-      }
       if (other.getMakeId() != 0L) {
         setMakeId(other.getMakeId());
       }
@@ -2063,25 +1829,19 @@ private static final long serialVersionUID = 0L;
         deviceModel_ = other.deviceModel_;
         onChanged();
       }
-      if (other.hasDeviceType()) {
-        bitField0_ |= 0x00000001;
-        deviceType_ = other.deviceType_;
-        onChanged();
+      if (other.hasDeviceTypeId()) {
+        setDeviceTypeId(other.getDeviceTypeId());
       }
-      if (other.hasDeviceModelCode()) {
-        bitField0_ |= 0x00000002;
-        deviceModelCode_ = other.deviceModelCode_;
+      if (!other.deviceModelCode_.isEmpty()) {
+        if (deviceModelCode_.isEmpty()) {
+          deviceModelCode_ = other.deviceModelCode_;
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          ensureDeviceModelCodeIsMutable();
+          deviceModelCode_.addAll(other.deviceModelCode_);
+        }
         onChanged();
       }
-      if (other.hasOverrideId()) {
-        setOverrideId(other.getOverrideId());
-      }
-      if (other.hasOsDefaultId()) {
-        setOsDefaultId(other.getOsDefaultId());
-      }
-      if (other.hasOsLatestId()) {
-        setOsLatestId(other.getOsLatestId());
-      }
       if (other.hasFamilyId()) {
         setFamilyId(other.getFamilyId());
       }
@@ -2089,12 +1849,12 @@ private static final long serialVersionUID = 0L;
         setIsFamily(other.getIsFamily());
       }
       if (other.hasManualUrl()) {
-        bitField0_ |= 0x00000080;
+        bitField0_ |= 0x00000010;
         manualUrl_ = other.manualUrl_;
         onChanged();
       }
       if (other.hasFaqUrl()) {
-        bitField0_ |= 0x00000100;
+        bitField0_ |= 0x00000020;
         faqUrl_ = other.faqUrl_;
         onChanged();
       }
@@ -2108,29 +1868,29 @@ private static final long serialVersionUID = 0L;
         setEosDate(other.getEosDate());
       }
       if (other.hasLifecyleConfidence()) {
-        bitField0_ |= 0x00001000;
+        bitField0_ |= 0x00000200;
         lifecyleConfidence_ = other.lifecyleConfidence_;
         onChanged();
       }
       if (other.hasPriceClass()) {
-        bitField0_ |= 0x00002000;
+        bitField0_ |= 0x00000400;
         priceClass_ = other.priceClass_;
         onChanged();
       }
       if (other.hasProductClass()) {
-        bitField0_ |= 0x00004000;
+        bitField0_ |= 0x00000800;
         productClass_ = other.productClass_;
         onChanged();
       }
       if (other.hasShIftttHandle()) {
-        bitField0_ |= 0x00008000;
+        bitField0_ |= 0x00001000;
         shIftttHandle_ = other.shIftttHandle_;
         onChanged();
       }
       if (!other.shGoogleAssLangs_.isEmpty()) {
         if (shGoogleAssLangs_.isEmpty()) {
           shGoogleAssLangs_ = other.shGoogleAssLangs_;
-          bitField0_ = (bitField0_ & ~0x00010000);
+          bitField0_ = (bitField0_ & ~0x00002000);
         } else {
           ensureShGoogleAssLangsIsMutable();
           shGoogleAssLangs_.addAll(other.shGoogleAssLangs_);
@@ -2140,7 +1900,7 @@ private static final long serialVersionUID = 0L;
       if (!other.shAlexaLangs_.isEmpty()) {
         if (shAlexaLangs_.isEmpty()) {
           shAlexaLangs_ = other.shAlexaLangs_;
-          bitField0_ = (bitField0_ & ~0x00020000);
+          bitField0_ = (bitField0_ & ~0x00004000);
         } else {
           ensureShAlexaLangsIsMutable();
           shAlexaLangs_.addAll(other.shAlexaLangs_);
@@ -2148,7 +1908,7 @@ private static final long serialVersionUID = 0L;
         onChanged();
       }
       if (other.hasShHassHandle()) {
-        bitField0_ |= 0x00040000;
+        bitField0_ |= 0x00008000;
         shHassHandle_ = other.shHassHandle_;
         onChanged();
       }
@@ -2156,17 +1916,17 @@ private static final long serialVersionUID = 0L;
         setShAppleHomeKit(other.getShAppleHomeKit());
       }
       if (other.hasShOpenHabHandle()) {
-        bitField0_ |= 0x00100000;
+        bitField0_ |= 0x00020000;
         shOpenHabHandle_ = other.shOpenHabHandle_;
         onChanged();
       }
       if (other.hasNistCpe()) {
-        bitField0_ |= 0x00200000;
+        bitField0_ |= 0x00040000;
         nistCpe_ = other.nistCpe_;
         onChanged();
       }
-      if (other.hasSpreadInType()) {
-        setSpreadInType(other.getSpreadInType());
+      if (other.hasPopularity()) {
+        setPopularity(other.getPopularity());
       }
       if (other.hasLastUpdateTime()) {
         setLastUpdateTime(other.getLastUpdateTime());
@@ -2209,104 +1969,28 @@ private static final long serialVersionUID = 0L;
      * <code>int64 id = 1;</code>
      * @return The id.
      */
-    @java.lang.Override
-    public long getId() {
-      return id_;
-    }
-    /**
-     * <code>int64 id = 1;</code>
-     * @param value The id to set.
-     * @return This builder for chaining.
-     */
-    public Builder setId(long value) {
-      
-      id_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>int64 id = 1;</code>
-     * @return This builder for chaining.
-     */
-    public Builder clearId() {
-      
-      id_ = 0L;
-      onChanged();
-      return this;
-    }
-
-    private java.lang.Object key_ = "";
-    /**
-     * <code>string key = 2;</code>
-     * @return The key.
-     */
-    public java.lang.String getKey() {
-      java.lang.Object ref = key_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        key_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string key = 2;</code>
-     * @return The bytes for key.
-     */
-    public com.google.protobuf.ByteString
-        getKeyBytes() {
-      java.lang.Object ref = key_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        key_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     * <code>string key = 2;</code>
-     * @param value The key to set.
-     * @return This builder for chaining.
-     */
-    public Builder setKey(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  
-      key_ = value;
-      onChanged();
-      return this;
+    @java.lang.Override
+    public long getId() {
+      return id_;
     }
     /**
-     * <code>string key = 2;</code>
+     * <code>int64 id = 1;</code>
+     * @param value The id to set.
      * @return This builder for chaining.
      */
-    public Builder clearKey() {
+    public Builder setId(long value) {
       
-      key_ = getDefaultInstance().getKey();
+      id_ = value;
       onChanged();
       return this;
     }
     /**
-     * <code>string key = 2;</code>
-     * @param value The bytes for key to set.
+     * <code>int64 id = 1;</code>
      * @return This builder for chaining.
      */
-    public Builder setKeyBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
+    public Builder clearId() {
       
-      key_ = value;
+      id_ = 0L;
       onChanged();
       return this;
     }
@@ -2418,285 +2102,151 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
-    private java.lang.Object deviceType_ = "";
+    private long deviceTypeId_ ;
     /**
-     * <code>string device_type = 5;</code>
-     * @return Whether the deviceType field is set.
+     * <code>int64 device_type_id = 5;</code>
+     * @return Whether the deviceTypeId field is set.
      */
-    public boolean hasDeviceType() {
+    @java.lang.Override
+    public boolean hasDeviceTypeId() {
       return ((bitField0_ & 0x00000001) != 0);
     }
     /**
-     * <code>string device_type = 5;</code>
-     * @return The deviceType.
+     * <code>int64 device_type_id = 5;</code>
+     * @return The deviceTypeId.
      */
-    public java.lang.String getDeviceType() {
-      java.lang.Object ref = deviceType_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        deviceType_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     * <code>string device_type = 5;</code>
-     * @return The bytes for deviceType.
-     */
-    public com.google.protobuf.ByteString
-        getDeviceTypeBytes() {
-      java.lang.Object ref = deviceType_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        deviceType_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    @java.lang.Override
+    public long getDeviceTypeId() {
+      return deviceTypeId_;
     }
     /**
-     * <code>string device_type = 5;</code>
-     * @param value The deviceType to set.
+     * <code>int64 device_type_id = 5;</code>
+     * @param value The deviceTypeId to set.
      * @return This builder for chaining.
      */
-    public Builder setDeviceType(
-        java.lang.String value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-      deviceType_ = value;
+    public Builder setDeviceTypeId(long value) {
+      bitField0_ |= 0x00000001;
+      deviceTypeId_ = value;
       onChanged();
       return this;
     }
     /**
-     * <code>string device_type = 5;</code>
+     * <code>int64 device_type_id = 5;</code>
      * @return This builder for chaining.
      */
-    public Builder clearDeviceType() {
+    public Builder clearDeviceTypeId() {
       bitField0_ = (bitField0_ & ~0x00000001);
-      deviceType_ = getDefaultInstance().getDeviceType();
+      deviceTypeId_ = 0L;
       onChanged();
       return this;
     }
+
+    private com.google.protobuf.LazyStringList deviceModelCode_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+    private void ensureDeviceModelCodeIsMutable() {
+      if (!((bitField0_ & 0x00000002) != 0)) {
+        deviceModelCode_ = new com.google.protobuf.LazyStringArrayList(deviceModelCode_);
+        bitField0_ |= 0x00000002;
+       }
+    }
     /**
-     * <code>string device_type = 5;</code>
-     * @param value The bytes for deviceType to set.
-     * @return This builder for chaining.
+     * <code>repeated string device_model_code = 6;</code>
+     * @return A list containing the deviceModelCode.
      */
-    public Builder setDeviceTypeBytes(
-        com.google.protobuf.ByteString value) {
-      if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000001;
-      deviceType_ = value;
-      onChanged();
-      return this;
+    public com.google.protobuf.ProtocolStringList
+        getDeviceModelCodeList() {
+      return deviceModelCode_.getUnmodifiableView();
     }
-
-    private java.lang.Object deviceModelCode_ = "";
     /**
-     * <code>string device_model_code = 6;</code>
-     * @return Whether the deviceModelCode field is set.
+     * <code>repeated string device_model_code = 6;</code>
+     * @return The count of deviceModelCode.
      */
-    public boolean hasDeviceModelCode() {
-      return ((bitField0_ & 0x00000002) != 0);
+    public int getDeviceModelCodeCount() {
+      return deviceModelCode_.size();
     }
     /**
-     * <code>string device_model_code = 6;</code>
-     * @return The deviceModelCode.
+     * <code>repeated string device_model_code = 6;</code>
+     * @param index The index of the element to return.
+     * @return The deviceModelCode at the given index.
      */
-    public java.lang.String getDeviceModelCode() {
-      java.lang.Object ref = deviceModelCode_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs =
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        deviceModelCode_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
+    public java.lang.String getDeviceModelCode(int index) {
+      return deviceModelCode_.get(index);
     }
     /**
-     * <code>string device_model_code = 6;</code>
-     * @return The bytes for deviceModelCode.
+     * <code>repeated string device_model_code = 6;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the deviceModelCode at the given index.
      */
     public com.google.protobuf.ByteString
-        getDeviceModelCodeBytes() {
-      java.lang.Object ref = deviceModelCode_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        deviceModelCode_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+        getDeviceModelCodeBytes(int index) {
+      return deviceModelCode_.getByteString(index);
     }
     /**
-     * <code>string device_model_code = 6;</code>
+     * <code>repeated string device_model_code = 6;</code>
+     * @param index The index to set the value at.
      * @param value The deviceModelCode to set.
      * @return This builder for chaining.
      */
     public Builder setDeviceModelCode(
-        java.lang.String value) {
+        int index, java.lang.String value) {
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000002;
-      deviceModelCode_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>string device_model_code = 6;</code>
-     * @return This builder for chaining.
-     */
-    public Builder clearDeviceModelCode() {
-      bitField0_ = (bitField0_ & ~0x00000002);
-      deviceModelCode_ = getDefaultInstance().getDeviceModelCode();
+  ensureDeviceModelCodeIsMutable();
+      deviceModelCode_.set(index, value);
       onChanged();
       return this;
     }
     /**
-     * <code>string device_model_code = 6;</code>
-     * @param value The bytes for deviceModelCode to set.
+     * <code>repeated string device_model_code = 6;</code>
+     * @param value The deviceModelCode to add.
      * @return This builder for chaining.
      */
-    public Builder setDeviceModelCodeBytes(
-        com.google.protobuf.ByteString value) {
+    public Builder addDeviceModelCode(
+        java.lang.String value) {
       if (value == null) {
     throw new NullPointerException();
   }
-  checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000002;
-      deviceModelCode_ = value;
-      onChanged();
-      return this;
-    }
-
-    private long overrideId_ ;
-    /**
-     * <code>int64 override_id = 7;</code>
-     * @return Whether the overrideId field is set.
-     */
-    @java.lang.Override
-    public boolean hasOverrideId() {
-      return ((bitField0_ & 0x00000004) != 0);
-    }
-    /**
-     * <code>int64 override_id = 7;</code>
-     * @return The overrideId.
-     */
-    @java.lang.Override
-    public long getOverrideId() {
-      return overrideId_;
-    }
-    /**
-     * <code>int64 override_id = 7;</code>
-     * @param value The overrideId to set.
-     * @return This builder for chaining.
-     */
-    public Builder setOverrideId(long value) {
-      bitField0_ |= 0x00000004;
-      overrideId_ = value;
-      onChanged();
-      return this;
-    }
-    /**
-     * <code>int64 override_id = 7;</code>
-     * @return This builder for chaining.
-     */
-    public Builder clearOverrideId() {
-      bitField0_ = (bitField0_ & ~0x00000004);
-      overrideId_ = 0L;
-      onChanged();
-      return this;
-    }
-
-    private long osDefaultId_ ;
-    /**
-     * <code>int64 os_default_id = 8;</code>
-     * @return Whether the osDefaultId field is set.
-     */
-    @java.lang.Override
-    public boolean hasOsDefaultId() {
-      return ((bitField0_ & 0x00000008) != 0);
-    }
-    /**
-     * <code>int64 os_default_id = 8;</code>
-     * @return The osDefaultId.
-     */
-    @java.lang.Override
-    public long getOsDefaultId() {
-      return osDefaultId_;
-    }
-    /**
-     * <code>int64 os_default_id = 8;</code>
-     * @param value The osDefaultId to set.
-     * @return This builder for chaining.
-     */
-    public Builder setOsDefaultId(long value) {
-      bitField0_ |= 0x00000008;
-      osDefaultId_ = value;
+  ensureDeviceModelCodeIsMutable();
+      deviceModelCode_.add(value);
       onChanged();
       return this;
     }
     /**
-     * <code>int64 os_default_id = 8;</code>
+     * <code>repeated string device_model_code = 6;</code>
+     * @param values The deviceModelCode to add.
      * @return This builder for chaining.
      */
-    public Builder clearOsDefaultId() {
-      bitField0_ = (bitField0_ & ~0x00000008);
-      osDefaultId_ = 0L;
+    public Builder addAllDeviceModelCode(
+        java.lang.Iterable<java.lang.String> values) {
+      ensureDeviceModelCodeIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(
+          values, deviceModelCode_);
       onChanged();
       return this;
     }
-
-    private long osLatestId_ ;
-    /**
-     * <code>int64 os_latest_id = 9;</code>
-     * @return Whether the osLatestId field is set.
-     */
-    @java.lang.Override
-    public boolean hasOsLatestId() {
-      return ((bitField0_ & 0x00000010) != 0);
-    }
-    /**
-     * <code>int64 os_latest_id = 9;</code>
-     * @return The osLatestId.
-     */
-    @java.lang.Override
-    public long getOsLatestId() {
-      return osLatestId_;
-    }
     /**
-     * <code>int64 os_latest_id = 9;</code>
-     * @param value The osLatestId to set.
+     * <code>repeated string device_model_code = 6;</code>
      * @return This builder for chaining.
      */
-    public Builder setOsLatestId(long value) {
-      bitField0_ |= 0x00000010;
-      osLatestId_ = value;
+    public Builder clearDeviceModelCode() {
+      deviceModelCode_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      bitField0_ = (bitField0_ & ~0x00000002);
       onChanged();
       return this;
     }
     /**
-     * <code>int64 os_latest_id = 9;</code>
+     * <code>repeated string device_model_code = 6;</code>
+     * @param value The bytes of the deviceModelCode to add.
      * @return This builder for chaining.
      */
-    public Builder clearOsLatestId() {
-      bitField0_ = (bitField0_ & ~0x00000010);
-      osLatestId_ = 0L;
+    public Builder addDeviceModelCodeBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      ensureDeviceModelCodeIsMutable();
+      deviceModelCode_.add(value);
       onChanged();
       return this;
     }
@@ -2708,7 +2258,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasFamilyId() {
-      return ((bitField0_ & 0x00000020) != 0);
+      return ((bitField0_ & 0x00000004) != 0);
     }
     /**
      * <code>int64 family_id = 10;</code>
@@ -2724,7 +2274,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setFamilyId(long value) {
-      bitField0_ |= 0x00000020;
+      bitField0_ |= 0x00000004;
       familyId_ = value;
       onChanged();
       return this;
@@ -2734,7 +2284,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearFamilyId() {
-      bitField0_ = (bitField0_ & ~0x00000020);
+      bitField0_ = (bitField0_ & ~0x00000004);
       familyId_ = 0L;
       onChanged();
       return this;
@@ -2747,7 +2297,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasIsFamily() {
-      return ((bitField0_ & 0x00000040) != 0);
+      return ((bitField0_ & 0x00000008) != 0);
     }
     /**
      * <code>bool is_family = 11;</code>
@@ -2763,7 +2313,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setIsFamily(boolean value) {
-      bitField0_ |= 0x00000040;
+      bitField0_ |= 0x00000008;
       isFamily_ = value;
       onChanged();
       return this;
@@ -2773,7 +2323,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearIsFamily() {
-      bitField0_ = (bitField0_ & ~0x00000040);
+      bitField0_ = (bitField0_ & ~0x00000008);
       isFamily_ = false;
       onChanged();
       return this;
@@ -2785,7 +2335,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the manualUrl field is set.
      */
     public boolean hasManualUrl() {
-      return ((bitField0_ & 0x00000080) != 0);
+      return ((bitField0_ & 0x00000010) != 0);
     }
     /**
      * <code>string manual_url = 12;</code>
@@ -2830,7 +2380,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000080;
+  bitField0_ |= 0x00000010;
       manualUrl_ = value;
       onChanged();
       return this;
@@ -2840,7 +2390,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearManualUrl() {
-      bitField0_ = (bitField0_ & ~0x00000080);
+      bitField0_ = (bitField0_ & ~0x00000010);
       manualUrl_ = getDefaultInstance().getManualUrl();
       onChanged();
       return this;
@@ -2856,7 +2406,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000080;
+      bitField0_ |= 0x00000010;
       manualUrl_ = value;
       onChanged();
       return this;
@@ -2868,7 +2418,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the faqUrl field is set.
      */
     public boolean hasFaqUrl() {
-      return ((bitField0_ & 0x00000100) != 0);
+      return ((bitField0_ & 0x00000020) != 0);
     }
     /**
      * <code>string faq_url = 13;</code>
@@ -2913,7 +2463,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00000100;
+  bitField0_ |= 0x00000020;
       faqUrl_ = value;
       onChanged();
       return this;
@@ -2923,7 +2473,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearFaqUrl() {
-      bitField0_ = (bitField0_ & ~0x00000100);
+      bitField0_ = (bitField0_ & ~0x00000020);
       faqUrl_ = getDefaultInstance().getFaqUrl();
       onChanged();
       return this;
@@ -2939,7 +2489,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00000100;
+      bitField0_ |= 0x00000020;
       faqUrl_ = value;
       onChanged();
       return this;
@@ -2952,7 +2502,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasReleaseDate() {
-      return ((bitField0_ & 0x00000200) != 0);
+      return ((bitField0_ & 0x00000040) != 0);
     }
     /**
      * <code>int64 release_date = 14;</code>
@@ -2968,7 +2518,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setReleaseDate(long value) {
-      bitField0_ |= 0x00000200;
+      bitField0_ |= 0x00000040;
       releaseDate_ = value;
       onChanged();
       return this;
@@ -2978,7 +2528,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearReleaseDate() {
-      bitField0_ = (bitField0_ & ~0x00000200);
+      bitField0_ = (bitField0_ & ~0x00000040);
       releaseDate_ = 0L;
       onChanged();
       return this;
@@ -2991,7 +2541,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasDiscDate() {
-      return ((bitField0_ & 0x00000400) != 0);
+      return ((bitField0_ & 0x00000080) != 0);
     }
     /**
      * <code>int64 disc_date = 15;</code>
@@ -3007,7 +2557,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setDiscDate(long value) {
-      bitField0_ |= 0x00000400;
+      bitField0_ |= 0x00000080;
       discDate_ = value;
       onChanged();
       return this;
@@ -3017,7 +2567,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearDiscDate() {
-      bitField0_ = (bitField0_ & ~0x00000400);
+      bitField0_ = (bitField0_ & ~0x00000080);
       discDate_ = 0L;
       onChanged();
       return this;
@@ -3030,7 +2580,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasEosDate() {
-      return ((bitField0_ & 0x00000800) != 0);
+      return ((bitField0_ & 0x00000100) != 0);
     }
     /**
      * <code>int64 eos_date = 26;</code>
@@ -3046,7 +2596,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setEosDate(long value) {
-      bitField0_ |= 0x00000800;
+      bitField0_ |= 0x00000100;
       eosDate_ = value;
       onChanged();
       return this;
@@ -3056,7 +2606,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearEosDate() {
-      bitField0_ = (bitField0_ & ~0x00000800);
+      bitField0_ = (bitField0_ & ~0x00000100);
       eosDate_ = 0L;
       onChanged();
       return this;
@@ -3068,7 +2618,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the lifecyleConfidence field is set.
      */
     public boolean hasLifecyleConfidence() {
-      return ((bitField0_ & 0x00001000) != 0);
+      return ((bitField0_ & 0x00000200) != 0);
     }
     /**
      * <code>string lifecyle_confidence = 29;</code>
@@ -3113,7 +2663,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00001000;
+  bitField0_ |= 0x00000200;
       lifecyleConfidence_ = value;
       onChanged();
       return this;
@@ -3123,7 +2673,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearLifecyleConfidence() {
-      bitField0_ = (bitField0_ & ~0x00001000);
+      bitField0_ = (bitField0_ & ~0x00000200);
       lifecyleConfidence_ = getDefaultInstance().getLifecyleConfidence();
       onChanged();
       return this;
@@ -3139,7 +2689,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00001000;
+      bitField0_ |= 0x00000200;
       lifecyleConfidence_ = value;
       onChanged();
       return this;
@@ -3151,7 +2701,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the priceClass field is set.
      */
     public boolean hasPriceClass() {
-      return ((bitField0_ & 0x00002000) != 0);
+      return ((bitField0_ & 0x00000400) != 0);
     }
     /**
      * <code>string price_class = 24;</code>
@@ -3196,7 +2746,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00002000;
+  bitField0_ |= 0x00000400;
       priceClass_ = value;
       onChanged();
       return this;
@@ -3206,7 +2756,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearPriceClass() {
-      bitField0_ = (bitField0_ & ~0x00002000);
+      bitField0_ = (bitField0_ & ~0x00000400);
       priceClass_ = getDefaultInstance().getPriceClass();
       onChanged();
       return this;
@@ -3222,7 +2772,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00002000;
+      bitField0_ |= 0x00000400;
       priceClass_ = value;
       onChanged();
       return this;
@@ -3234,7 +2784,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the productClass field is set.
      */
     public boolean hasProductClass() {
-      return ((bitField0_ & 0x00004000) != 0);
+      return ((bitField0_ & 0x00000800) != 0);
     }
     /**
      * <code>string product_class = 25;</code>
@@ -3279,7 +2829,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00004000;
+  bitField0_ |= 0x00000800;
       productClass_ = value;
       onChanged();
       return this;
@@ -3289,7 +2839,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearProductClass() {
-      bitField0_ = (bitField0_ & ~0x00004000);
+      bitField0_ = (bitField0_ & ~0x00000800);
       productClass_ = getDefaultInstance().getProductClass();
       onChanged();
       return this;
@@ -3305,7 +2855,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00004000;
+      bitField0_ |= 0x00000800;
       productClass_ = value;
       onChanged();
       return this;
@@ -3317,7 +2867,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the shIftttHandle field is set.
      */
     public boolean hasShIftttHandle() {
-      return ((bitField0_ & 0x00008000) != 0);
+      return ((bitField0_ & 0x00001000) != 0);
     }
     /**
      * <code>string sh_ifttt_handle = 17;</code>
@@ -3362,7 +2912,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00008000;
+  bitField0_ |= 0x00001000;
       shIftttHandle_ = value;
       onChanged();
       return this;
@@ -3372,7 +2922,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearShIftttHandle() {
-      bitField0_ = (bitField0_ & ~0x00008000);
+      bitField0_ = (bitField0_ & ~0x00001000);
       shIftttHandle_ = getDefaultInstance().getShIftttHandle();
       onChanged();
       return this;
@@ -3388,7 +2938,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00008000;
+      bitField0_ |= 0x00001000;
       shIftttHandle_ = value;
       onChanged();
       return this;
@@ -3396,9 +2946,9 @@ private static final long serialVersionUID = 0L;
 
     private com.google.protobuf.LazyStringList shGoogleAssLangs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     private void ensureShGoogleAssLangsIsMutable() {
-      if (!((bitField0_ & 0x00010000) != 0)) {
+      if (!((bitField0_ & 0x00002000) != 0)) {
         shGoogleAssLangs_ = new com.google.protobuf.LazyStringArrayList(shGoogleAssLangs_);
-        bitField0_ |= 0x00010000;
+        bitField0_ |= 0x00002000;
        }
     }
     /**
@@ -3483,7 +3033,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearShGoogleAssLangs() {
       shGoogleAssLangs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00010000);
+      bitField0_ = (bitField0_ & ~0x00002000);
       onChanged();
       return this;
     }
@@ -3506,9 +3056,9 @@ private static final long serialVersionUID = 0L;
 
     private com.google.protobuf.LazyStringList shAlexaLangs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
     private void ensureShAlexaLangsIsMutable() {
-      if (!((bitField0_ & 0x00020000) != 0)) {
+      if (!((bitField0_ & 0x00004000) != 0)) {
         shAlexaLangs_ = new com.google.protobuf.LazyStringArrayList(shAlexaLangs_);
-        bitField0_ |= 0x00020000;
+        bitField0_ |= 0x00004000;
        }
     }
     /**
@@ -3593,7 +3143,7 @@ private static final long serialVersionUID = 0L;
      */
     public Builder clearShAlexaLangs() {
       shAlexaLangs_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      bitField0_ = (bitField0_ & ~0x00020000);
+      bitField0_ = (bitField0_ & ~0x00004000);
       onChanged();
       return this;
     }
@@ -3620,7 +3170,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the shHassHandle field is set.
      */
     public boolean hasShHassHandle() {
-      return ((bitField0_ & 0x00040000) != 0);
+      return ((bitField0_ & 0x00008000) != 0);
     }
     /**
      * <code>string sh_hass_handle = 20;</code>
@@ -3665,7 +3215,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00040000;
+  bitField0_ |= 0x00008000;
       shHassHandle_ = value;
       onChanged();
       return this;
@@ -3675,7 +3225,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearShHassHandle() {
-      bitField0_ = (bitField0_ & ~0x00040000);
+      bitField0_ = (bitField0_ & ~0x00008000);
       shHassHandle_ = getDefaultInstance().getShHassHandle();
       onChanged();
       return this;
@@ -3691,7 +3241,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00040000;
+      bitField0_ |= 0x00008000;
       shHassHandle_ = value;
       onChanged();
       return this;
@@ -3704,7 +3254,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasShAppleHomeKit() {
-      return ((bitField0_ & 0x00080000) != 0);
+      return ((bitField0_ & 0x00010000) != 0);
     }
     /**
      * <code>bool sh_apple_home_kit = 21;</code>
@@ -3720,7 +3270,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setShAppleHomeKit(boolean value) {
-      bitField0_ |= 0x00080000;
+      bitField0_ |= 0x00010000;
       shAppleHomeKit_ = value;
       onChanged();
       return this;
@@ -3730,7 +3280,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearShAppleHomeKit() {
-      bitField0_ = (bitField0_ & ~0x00080000);
+      bitField0_ = (bitField0_ & ~0x00010000);
       shAppleHomeKit_ = false;
       onChanged();
       return this;
@@ -3742,7 +3292,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the shOpenHabHandle field is set.
      */
     public boolean hasShOpenHabHandle() {
-      return ((bitField0_ & 0x00100000) != 0);
+      return ((bitField0_ & 0x00020000) != 0);
     }
     /**
      * <code>string sh_open_hab_handle = 22;</code>
@@ -3787,7 +3337,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00100000;
+  bitField0_ |= 0x00020000;
       shOpenHabHandle_ = value;
       onChanged();
       return this;
@@ -3797,7 +3347,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearShOpenHabHandle() {
-      bitField0_ = (bitField0_ & ~0x00100000);
+      bitField0_ = (bitField0_ & ~0x00020000);
       shOpenHabHandle_ = getDefaultInstance().getShOpenHabHandle();
       onChanged();
       return this;
@@ -3813,7 +3363,7 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00100000;
+      bitField0_ |= 0x00020000;
       shOpenHabHandle_ = value;
       onChanged();
       return this;
@@ -3825,7 +3375,7 @@ private static final long serialVersionUID = 0L;
      * @return Whether the nistCpe field is set.
      */
     public boolean hasNistCpe() {
-      return ((bitField0_ & 0x00200000) != 0);
+      return ((bitField0_ & 0x00040000) != 0);
     }
     /**
      * <code>string nist_cpe = 28;</code>
@@ -3870,7 +3420,7 @@ private static final long serialVersionUID = 0L;
       if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00200000;
+  bitField0_ |= 0x00040000;
       nistCpe_ = value;
       onChanged();
       return this;
@@ -3880,7 +3430,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearNistCpe() {
-      bitField0_ = (bitField0_ & ~0x00200000);
+      bitField0_ = (bitField0_ & ~0x00040000);
       nistCpe_ = getDefaultInstance().getNistCpe();
       onChanged();
       return this;
@@ -3896,47 +3446,47 @@ private static final long serialVersionUID = 0L;
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-      bitField0_ |= 0x00200000;
+      bitField0_ |= 0x00040000;
       nistCpe_ = value;
       onChanged();
       return this;
     }
 
-    private double spreadInType_ ;
+    private int popularity_ ;
     /**
-     * <code>double spread_in_type = 23;</code>
-     * @return Whether the spreadInType field is set.
+     * <code>int32 popularity = 23;</code>
+     * @return Whether the popularity field is set.
      */
     @java.lang.Override
-    public boolean hasSpreadInType() {
-      return ((bitField0_ & 0x00400000) != 0);
+    public boolean hasPopularity() {
+      return ((bitField0_ & 0x00080000) != 0);
     }
     /**
-     * <code>double spread_in_type = 23;</code>
-     * @return The spreadInType.
+     * <code>int32 popularity = 23;</code>
+     * @return The popularity.
      */
     @java.lang.Override
-    public double getSpreadInType() {
-      return spreadInType_;
+    public int getPopularity() {
+      return popularity_;
     }
     /**
-     * <code>double spread_in_type = 23;</code>
-     * @param value The spreadInType to set.
+     * <code>int32 popularity = 23;</code>
+     * @param value The popularity to set.
      * @return This builder for chaining.
      */
-    public Builder setSpreadInType(double value) {
-      bitField0_ |= 0x00400000;
-      spreadInType_ = value;
+    public Builder setPopularity(int value) {
+      bitField0_ |= 0x00080000;
+      popularity_ = value;
       onChanged();
       return this;
     }
     /**
-     * <code>double spread_in_type = 23;</code>
+     * <code>int32 popularity = 23;</code>
      * @return This builder for chaining.
      */
-    public Builder clearSpreadInType() {
-      bitField0_ = (bitField0_ & ~0x00400000);
-      spreadInType_ = 0D;
+    public Builder clearPopularity() {
+      bitField0_ = (bitField0_ & ~0x00080000);
+      popularity_ = 0;
       onChanged();
       return this;
     }
@@ -3948,7 +3498,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasLastUpdateTime() {
-      return ((bitField0_ & 0x00800000) != 0);
+      return ((bitField0_ & 0x00100000) != 0);
     }
     /**
      * <code>int64 last_update_time = 16;</code>
@@ -3964,7 +3514,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setLastUpdateTime(long value) {
-      bitField0_ |= 0x00800000;
+      bitField0_ |= 0x00100000;
       lastUpdateTime_ = value;
       onChanged();
       return this;
@@ -3974,7 +3524,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearLastUpdateTime() {
-      bitField0_ = (bitField0_ & ~0x00800000);
+      bitField0_ = (bitField0_ & ~0x00100000);
       lastUpdateTime_ = 0L;
       onChanged();
       return this;
@@ -3991,7 +3541,7 @@ private static final long serialVersionUID = 0L;
      */
     @java.lang.Override
     public boolean hasMatchScore() {
-      return ((bitField0_ & 0x01000000) != 0);
+      return ((bitField0_ & 0x00200000) != 0);
     }
     /**
      * <pre>
@@ -4015,7 +3565,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder setMatchScore(int value) {
-      bitField0_ |= 0x01000000;
+      bitField0_ |= 0x00200000;
       matchScore_ = value;
       onChanged();
       return this;
@@ -4029,7 +3579,7 @@ private static final long serialVersionUID = 0L;
      * @return This builder for chaining.
      */
     public Builder clearMatchScore() {
-      bitField0_ = (bitField0_ & ~0x01000000);
+      bitField0_ = (bitField0_ & ~0x00200000);
       matchScore_ = 0;
       onChanged();
       return this;