diff --git a/AutofillFramework/.google/packaging.yaml b/AutofillFramework/.google/packaging.yaml
index f989c63..a83eca9 100644
--- a/AutofillFramework/.google/packaging.yaml
+++ b/AutofillFramework/.google/packaging.yaml
@@ -6,7 +6,7 @@
 ---
 status:       PUBLISHED
 technologies: [Android]
-categories:   [Input, Android O Preview]
+categories:   [Input]
 languages:    [Java]
 solutions:    [Mobile]
 github:       android/input
diff --git a/AutofillFrameworkKotlin/.google/packaging.yaml b/AutofillFrameworkKotlin/.google/packaging.yaml
index 3bb432b..2c5a6d5 100644
--- a/AutofillFrameworkKotlin/.google/packaging.yaml
+++ b/AutofillFrameworkKotlin/.google/packaging.yaml
@@ -6,7 +6,7 @@
 ---
 status:       PUBLISHED
 technologies: [Android]
-categories:   [Input, Android O Preview]
+categories:   [Input]
 languages:    [Kotlin]
 solutions:    [Mobile]
 github:       android/input
diff --git a/BasicGestureDetect/.google/packaging.yaml b/BasicGestureDetect/.google/packaging.yaml
index 0ced5e4..9a6cc24 100644
--- a/BasicGestureDetect/.google/packaging.yaml
+++ b/BasicGestureDetect/.google/packaging.yaml
@@ -6,7 +6,7 @@
 ---
 status:       PUBLISHED
 technologies: [Android]
-categories:   [UI, Input]
+categories:   [Input]
 languages:    [Java]
 solutions:    [Mobile]
 github:       android/input
diff --git a/BasicMultitouch/.google/packaging.yaml b/BasicMultitouch/.google/packaging.yaml
index 1ebbda9..6247e53 100644
--- a/BasicMultitouch/.google/packaging.yaml
+++ b/BasicMultitouch/.google/packaging.yaml
@@ -6,7 +6,7 @@
 ---
 status:       PUBLISHED
 technologies: [Android]
-categories:   [UI, Views, Input]
+categories:   [Input]
 languages:    [Java]
 solutions:    [Mobile]
 github:       android/input
diff --git a/CommitContentSampleApp/.google/packaging.yaml b/CommitContentSampleApp/.google/packaging.yaml
index d5cdaba..a7ff000 100644
--- a/CommitContentSampleApp/.google/packaging.yaml
+++ b/CommitContentSampleApp/.google/packaging.yaml
@@ -6,7 +6,7 @@
 ---
 status:       PUBLISHED
 technologies: [Android]
-categories:   [System]
+categories:   [Input]
 languages:    [Java]
 solutions:    [Mobile]
 github:       android/input
diff --git a/CommitContentSampleIME/.google/packaging.yaml b/CommitContentSampleIME/.google/packaging.yaml
index d5cdaba..a7ff000 100644
--- a/CommitContentSampleIME/.google/packaging.yaml
+++ b/CommitContentSampleIME/.google/packaging.yaml
@@ -6,7 +6,7 @@
 ---
 status:       PUBLISHED
 technologies: [Android]
-categories:   [System]
+categories:   [Input]
 languages:    [Java]
 solutions:    [Mobile]
 github:       android/input