diff --git a/components/fxa-client/src/fxa_msg_types.proto b/components/fxa-client/src/fxa_msg_types.proto
index 4058be962..93e9d78d5 100644
--- a/components/fxa-client/src/fxa_msg_types.proto
+++ b/components/fxa-client/src/fxa_msg_types.proto
@@ -6,6 +6,7 @@ package msg_types;
 
 option java_package = "mozilla.appservices.fxaclient";
 option java_outer_classname = "MsgTypes";
+option optimize_for = LITE_RUNTIME;
 
 message Profile {
     optional string uid = 1;
diff --git a/components/logins/src/logins_msg_types.proto b/components/logins/src/logins_msg_types.proto
index b2637401c..3c3cdb554 100644
--- a/components/logins/src/logins_msg_types.proto
+++ b/components/logins/src/logins_msg_types.proto
@@ -4,6 +4,7 @@ package msg_types;
 
 option java_package = "mozilla.appservices.logins";
 option java_outer_classname = "MsgTypes";
+option optimize_for = LITE_RUNTIME;
 
 message PasswordInfo {
     required string id = 1;
diff --git a/components/places/src/places_msg_types.proto b/components/places/src/places_msg_types.proto
index 8d9e71c2c..e9f208dcb 100644
--- a/components/places/src/places_msg_types.proto
+++ b/components/places/src/places_msg_types.proto
@@ -6,6 +6,7 @@ package msg_types;
 
 option java_package = "mozilla.appservices.places";
 option java_outer_classname = "MsgTypes";
+option optimize_for = LITE_RUNTIME;
 
 message HistoryVisitInfo {
     required string url = 1;
diff --git a/components/push/src/push_msg_types.proto b/components/push/src/push_msg_types.proto
index e937045f2..2b892eb5f 100644
--- a/components/push/src/push_msg_types.proto
+++ b/components/push/src/push_msg_types.proto
@@ -4,6 +4,7 @@ package msg_types;
 
 option java_package = "mozilla.appservices.push";
 option java_outer_classname = "MsgTypes";
+option optimize_for = LITE_RUNTIME;
 
 message DispatchInfo {
     required string uaid = 1;
@@ -34,4 +35,4 @@ message PushSubscriptionChanged {
 
 message PushSubscriptionsChanged {
     repeated PushSubscriptionChanged subs = 1;
-}
\ No newline at end of file
+}
diff --git a/components/sync_manager/src/manager_msg_types.proto b/components/sync_manager/src/manager_msg_types.proto
index 8493bef16..82b748f12 100644
--- a/components/sync_manager/src/manager_msg_types.proto
+++ b/components/sync_manager/src/manager_msg_types.proto
@@ -6,6 +6,7 @@ package msg_types;
 
 option java_package = "mozilla.appservices.syncmanager";
 option java_outer_classname = "MsgTypes";
+option optimize_for = LITE_RUNTIME;
 
 enum SyncReason {
     SCHEDULED = 1;
diff --git a/components/tabs/src/tabs_msg_types.proto b/components/tabs/src/tabs_msg_types.proto
index c45e26289..1209d7cd5 100644
--- a/components/tabs/src/tabs_msg_types.proto
+++ b/components/tabs/src/tabs_msg_types.proto
@@ -6,6 +6,7 @@ package msg_types;
 
 option java_package = "mozilla.appservices.remotetabs";
 option java_outer_classname = "MsgTypes";
+option optimize_for = LITE_RUNTIME;
 
 message ClientTabs {
     required string client_id = 1;
diff --git a/components/viaduct/src/fetch_msg_types.proto b/components/viaduct/src/fetch_msg_types.proto
index 7015a65e3..4c73c9bf4 100644
--- a/components/viaduct/src/fetch_msg_types.proto
+++ b/components/viaduct/src/fetch_msg_types.proto
@@ -6,6 +6,7 @@ package msg_types;
 
 option java_package = "mozilla.appservices.httpconfig";
 option java_outer_classname = "MsgTypes";
+option optimize_for = LITE_RUNTIME;
 
 message Request {
     enum Method {