Merge upstream-main.
Bug: 202808853
Change-Id: I76b6f78ed64ba9ad445ad9d8b21e217eafc8477f
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..6d8601b
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: RESTRICTED
+}
diff --git a/OWNERS.android b/OWNERS.android
new file mode 100644
index 0000000..6493d73
--- /dev/null
+++ b/OWNERS.android
@@ -0,0 +1,10 @@
+# This project should have only merges from upstream.
+# The following are top 2018 google contributers found in AOSP Gerrit.
+# Please update this list if you find better candidates.
+akahuang@google.com
+cywang@google.com
+harpreet@google.com
+kinaba@google.com
+kirtika@google.com
+nxia@google.com
+xixuan@google.com
diff --git a/server/site_tests/platform_BootDevice/control.1 b/server/site_tests/platform_BootDevice/control.1
index fb5b61f..081092f 100644
--- a/server/site_tests/platform_BootDevice/control.1
+++ b/server/site_tests/platform_BootDevice/control.1
@@ -4,7 +4,7 @@
NAME = "platform_BootDevice.BootDevice1"
AUTHOR = "Brillo Team"
-ATTRIBUTES = "suite:brillo-presubmit,suite:sb65-presubmit"
+ATTRIBUTES = "suite:brillo-presubmit"
TIME = "SHORT"
TEST_CATEGORY = "functional"
TEST_CLASS = "platform"
