diff --git a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/CastOptions.java b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/CastOptions.java
index 2592c821..75dd0850 100644
--- a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/CastOptions.java
+++ b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/CastOptions.java
@@ -26,31 +26,23 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CastOptions extends AutoSafeParcelable {
-    @SafeParceled(1)
+    @Field(1)
     private int versionCode = 1;
-
-    @SafeParceled(2)
+    @Field(2)
     private String receiverApplicationId;
-
-    @SafeParceled(3)
+    @Field(3)
     private ArrayList<String> supportedNamespaces;
-
-    @SafeParceled(4)
+    @Field(4)
     private boolean stopReceiverApplicationWhenEndingSession;
-
-    @SafeParceled(5)
+    @Field(5)
     private LaunchOptions launchOptions;
-
-    @SafeParceled(6)
+    @Field(6)
     private boolean resumeSavedSession;
-
-    @SafeParceled(7)
+    @Field(7)
     private CastMediaOptions castMediaOptions;
-
-    @SafeParceled(8)
+    @Field(8)
     private boolean enableReconnectionService;
-
-    @SafeParceled(9)
+    @Field(9)
     private double volumeDeltaBeforeIceCreamSandwich;
 
     public String getReceiverApplicationId() {
diff --git a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/CastMediaOptions.java b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/CastMediaOptions.java
index 3db58f3e..2a9afe90 100644
--- a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/CastMediaOptions.java
+++ b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/CastMediaOptions.java
@@ -21,16 +21,20 @@ import org.microg.safeparcel.SafeParceled;
 
 public class CastMediaOptions extends AutoSafeParcelable {
 
-    @SafeParceled(1)
+    @Field(1)
     private int versionCode = 1;
-    @SafeParceled(2)
+    @Field(2)
     public String mediaIntentReceiverClassName;
-    @SafeParceled(3)
+    @Field(3)
     public String expandedControllerActivityClassName;
-    @SafeParceled(4)
+    @Field(4)
     public IImagePicker imagePicker;
-    @SafeParceled(5)
+    @Field(5)
     public NotificationOptions notificationOptions;
+    @Field(6)
+    public boolean bool6;
+    @Field(7)
+    public boolean bool7;
 
     public static Creator<CastMediaOptions> CREATOR = new AutoCreator<CastMediaOptions>(CastMediaOptions.class);
 }
diff --git a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/NotificationOptions.java b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/NotificationOptions.java
index bfed1ad4..2219e4a3 100644
--- a/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/NotificationOptions.java
+++ b/play-services-cast-framework-api/src/main/java/com/google/android/gms/cast/framework/media/NotificationOptions.java
@@ -25,71 +25,71 @@ import org.microg.safeparcel.SafeParceled;
 
 public class NotificationOptions extends AutoSafeParcelable {
 
-    @SafeParceled(1)
+    @Field(1)
     private int versionCode = 1;
-    @SafeParceled(2)
+    @Field(2)
     public List<String> actions;
-    @SafeParceled(3)
+    @Field(3)
     public int[] compatActionIndices;
-    @SafeParceled(4)
+    @Field(4)
     public long skipStepMs;
-    @SafeParceled(5)
+    @Field(5)
     public String targetActivityClassName;
-    @SafeParceled(6)
+    @Field(6)
     public int getSmallIconDrawableResId;
-    @SafeParceled(7)
+    @Field(7)
     public int getStopLiveStreamDrawableResId;
-    @SafeParceled(8)
+    @Field(8)
     public int getPauseDrawableResId;
-    @SafeParceled(9)
+    @Field(9)
     public int getPlayDrawableResId;
-    @SafeParceled(10)
+    @Field(10)
     public int getSkipNextDrawableResId;
-    @SafeParceled(11)
+    @Field(11)
     public int getSkipPrevDrawableResId;
-    @SafeParceled(12)
+    @Field(12)
     public int getForwardDrawableResId;
-    @SafeParceled(13)
+    @Field(13)
     public int getForward10DrawableResId;
-    @SafeParceled(14)
+    @Field(14)
     public int getForward30DrawableResId;
-    @SafeParceled(15)
+    @Field(15)
     public int getRewindDrawableResId;
-    @SafeParceled(16)
+    @Field(16)
     public int getRewind10DrawableResId;
-    @SafeParceled(17)
+    @Field(17)
     public int getRewind30DrawableResId;
-    @SafeParceled(18)
+    @Field(18)
     public int getDisconnectDrawableResId;
-    @SafeParceled(19)
+    @Field(19)
     public int intvar19;
-    @SafeParceled(20)
+    @Field(20)
     public int getCastingToDeviceStringResId;
-    @SafeParceled(21)
+    @Field(21)
     public int getStopLiveStreamTitleResId;
-    @SafeParceled(22)
+    @Field(22)
     public int intvar22;
-    @SafeParceled(23)
+    @Field(23)
     public int intvar23;
-    @SafeParceled(24)
+    @Field(24)
     public int intvar24;
-    @SafeParceled(25)
+    @Field(25)
     public int intvar25;
-    @SafeParceled(26)
+    @Field(26)
     public int intvar26;
-    @SafeParceled(27)
+    @Field(27)
     public int intvar27;
-    @SafeParceled(28)
+    @Field(28)
     public int intvar28;
-    @SafeParceled(29)
+    @Field(29)
     public int intvar29;
-    @SafeParceled(30)
+    @Field(30)
     public int intvar30;
-    @SafeParceled(31)
+    @Field(31)
     public int intvar31;
-    @SafeParceled(32)
+    @Field(32)
     public int intvar32;
-    @SafeParceled(33)
+    @Field(33)
     public INotificationActionsProvider notificationActionsProvider;
 
     public static Creator<NotificationOptions> CREATOR = new AutoCreator<NotificationOptions>(NotificationOptions.class);