Merge remote-tracking branch 'goog/upstream-master' into D2-TM-009 am: 4e1fe7bd61

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/18880196

Change-Id: Ic89ed9bd88afcc958a5810617d618cce4f780e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/nugget/proto/nugget/app/identity/identity.proto b/nugget/proto/nugget/app/identity/identity.proto
index 591a92a..a29aa16 100644
--- a/nugget/proto/nugget/app/identity/identity.proto
+++ b/nugget/proto/nugget/app/identity/identity.proto
@@ -29,8 +29,8 @@
   option (nugget.protobuf.app_id) = "IDENTITY";
   option (nugget.protobuf.app_name) = "Identity";
   option (nugget.protobuf.app_version) = 1;
-  option (nugget.protobuf.request_buffer_size) = 1024;
-  option (nugget.protobuf.response_buffer_size) = 1024;
+  option (nugget.protobuf.request_buffer_size) = 2048;
+  option (nugget.protobuf.response_buffer_size) = 2048;
 
   // RPCs for the Identity HAL
   rpc WICinitialize (WICinitializeRequest) returns (WICinitializeResponse);
diff --git a/nugget/proto/nugget/app/keymaster/keymaster.options b/nugget/proto/nugget/app/keymaster/keymaster.options
index 4d99765..d6eb175 100644
--- a/nugget/proto/nugget/app/keymaster/keymaster.options
+++ b/nugget/proto/nugget/app/keymaster/keymaster.options
@@ -15,7 +15,7 @@
 nugget.app.keymaster.ProvisionPresharedSecretRequest.preshared_secret max_size:32
 nugget.app.keymaster.StartAttestKeyRequest.not_before max_size:15
 nugget.app.keymaster.StartAttestKeyRequest.not_after max_size:15
-nugget.app.keymaster.StartAttestKeyRequest.caller_issuer_subj_name max_size:64
+nugget.app.keymaster.StartAttestKeyRequest.caller_issuer_subj_name max_size:100
 nugget.app.keymaster.ProvisionPresharedSecretResponse.digest max_size:32
 nugget.app.keymaster.ProvisionCertificatesRequest.cert_block max_size: 1024
 nugget.app.keymaster.ProvisionCertificatesRequest.digest max_size: 32