diff --git a/core/java/com/android/internal/util/nad/PixelPropsUtils.java b/core/java/com/android/internal/util/nad/PixelPropsUtils.java
index b484f583ce29c..668bfa1c404bd 100644
--- a/core/java/com/android/internal/util/nad/PixelPropsUtils.java
+++ b/core/java/com/android/internal/util/nad/PixelPropsUtils.java
@@ -63,10 +63,10 @@ public class PixelPropsUtils {
         propsToChange = new HashMap<>();
         propsToChange.put("BRAND", "google");
         propsToChange.put("MANUFACTURER", "Google");
-        propsToChange.put("DEVICE", "redfin");
-        propsToChange.put("PRODUCT", "redfin");
-        propsToChange.put("MODEL", "Pixel 5");
-        propsToChange.put("FINGERPRINT", "google/redfin/redfin:12/SP2A.220305.012/8177914:user/release-keys");
+        propsToChange.put("DEVICE", "walleye");
+        propsToChange.put("PRODUCT", "walleye");
+        propsToChange.put("MODEL", "Pixel 2");
+        propsToChange.put("FINGERPRINT", "google/walleye/walleye:8.1.0/OPM1.171019.011/4448085:user/release-keys");
         propsToChangePixelXL = new HashMap<>();
         propsToChangePixelXL.put("BRAND", "google");
         propsToChangePixelXL.put("MANUFACTURER", "Google");
@@ -80,7 +80,7 @@ public class PixelPropsUtils {
         propsToChangePixel3XL.put("DEVICE", "crosshatch");
         propsToChangePixel3XL.put("PRODUCT", "crosshatch");
         propsToChangePixel3XL.put("MODEL", "Pixel 3 XL");
-        propsToChangePixel3XL.put("FINGERPRINT", "google/crosshatch/crosshatch:11/RQ3A.211001.001/7641976:user/release-keys");
+        propsToChangePixel3XL.put("FINGERPRINT", "google/crosshatch/crosshatch:12/SP1A.210812.016.C2/8618562:user/release-keys");
     }
 
     public static void setProps(String packageName) {