Merge remote-tracking branch 'goog/upstream-master' into MP-SC-07 am: 66d171745c

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

Change-Id: Ib824721d21390e244adaf3b83b0b0de0ee761e2d
diff --git a/nugget/proto/nugget/app/avb/avb.proto b/nugget/proto/nugget/app/avb/avb.proto
index bc0c700..9aec71e 100644
--- a/nugget/proto/nugget/app/avb/avb.proto
+++ b/nugget/proto/nugget/app/avb/avb.proto
@@ -53,13 +53,16 @@
 }
 
 // GetState
-message GetStateRequest {}
+message GetStateRequest {
+  bool keysclear_reset = 1;
+}
 message GetStateResponse {
   uint64 version = 1;
   bool bootloader = 2;
   bool production = 3;
   uint32 number_of_locks = 4;
   bytes locks = 5;
+  bool keysclear_required = 6;
 }
 
 // Load