diff --git a/connectivity/bluetooth/BluetoothAdvertisements/template-params.xml b/connectivity/bluetooth/BluetoothAdvertisements/template-params.xml
index 4bd4f2a..6502488 100644
--- a/connectivity/bluetooth/BluetoothAdvertisements/template-params.xml
+++ b/connectivity/bluetooth/BluetoothAdvertisements/template-params.xml
@@ -50,7 +50,7 @@
 
 
     <metadata>
-        <status>DRAFT</status>
+        <status>PUBLISHED</status>
         <categories>Connectivity</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
diff --git a/content/documentsUi/DirectorySelection/template-params.xml b/content/documentsUi/DirectorySelection/template-params.xml
index c0172f6..2426f9a 100644
--- a/content/documentsUi/DirectorySelection/template-params.xml
+++ b/content/documentsUi/DirectorySelection/template-params.xml
@@ -36,7 +36,7 @@
     <template src="base" />
 
     <metadata>
-        <status>DRAFTED</status>
+        <status>PUBLISHED</status>
         <categories>Content</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
diff --git a/content/documentsUi/ScopedDirectoryAccess/template-params.xml b/content/documentsUi/ScopedDirectoryAccess/template-params.xml
index 8116116..4879b97 100644
--- a/content/documentsUi/ScopedDirectoryAccess/template-params.xml
+++ b/content/documentsUi/ScopedDirectoryAccess/template-params.xml
@@ -17,7 +17,7 @@
 
 <sample>
     <name>ScopedDirectoryAccess</name>
-    <group>Android N Preview</group>  <!-- This field will be deprecated in the future
+    <group>Content</group>  <!-- This field will be deprecated in the future
                             and replaced with the "categories" tags below. -->
     <package>com.example.android.scopeddirectoryaccess</package>
 
@@ -43,7 +43,7 @@
 
     <metadata>
         <status>PUBLISHED</status>
-        <categories>Android N Preview</categories>
+        <categories>Content</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
         <solutions>Mobile</solutions>
diff --git a/notification/ActiveNotifications/template-params.xml b/notification/ActiveNotifications/template-params.xml
index 6728c85..d750bbc 100644
--- a/notification/ActiveNotifications/template-params.xml
+++ b/notification/ActiveNotifications/template-params.xml
@@ -16,7 +16,7 @@
 -->
 <sample>
     <name>ActiveNotifications</name>
-    <group>Android N Preview</group>
+    <group>Notification</group>
     <package>com.example.android.activenotifications</package>
 
     <minSdk>24</minSdk>
@@ -44,8 +44,8 @@
     <common src="logger" />
 
     <metadata>
-        <status>DRAFT</status>
-        <categories>Getting Started, Notification, Android N Preview</categories>
+        <status>PUBLISHED</status>
+        <categories>Notification</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
         <solutions>Mobile</solutions>
diff --git a/notification/MessagingService/template-params.xml b/notification/MessagingService/template-params.xml
index 554163c..8113c3f 100644
--- a/notification/MessagingService/template-params.xml
+++ b/notification/MessagingService/template-params.xml
@@ -16,7 +16,7 @@
 -->
 <sample>
     <name>MessagingService</name>
-    <group>Android N Preview</group>
+    <group>Notification</group>
     <package>com.example.android.messagingservice</package>
 
     <minSdk>21</minSdk>
@@ -42,7 +42,7 @@
     <template src="base-application" />
     <metadata>
         <status>PUBLISHED</status>
-        <categories>Android N Preview</categories>
+        <categories>Notification</categories>
         <!-- Old Categories: UI, Notification -->
         <technologies>Android</technologies>
         <languages>Java</languages>
diff --git a/security/DirectBoot/template-params.xml b/security/DirectBoot/template-params.xml
index b020ec1..a9aa69d 100644
--- a/security/DirectBoot/template-params.xml
+++ b/security/DirectBoot/template-params.xml
@@ -17,7 +17,7 @@
 
 <sample>
     <name>DirectBoot</name>
-    <group>Android N Preview</group>  <!-- This field will be deprecated in the future
+    <group>Security</group>  <!-- This field will be deprecated in the future
                             and replaced with the "categories" tags below. -->
     <package>com.example.android.directboot</package>
 
diff --git a/security/FingerprintDialog/template-params.xml b/security/FingerprintDialog/template-params.xml
index 7818492..37a84fe 100644
--- a/security/FingerprintDialog/template-params.xml
+++ b/security/FingerprintDialog/template-params.xml
@@ -41,7 +41,7 @@
 
     <metadata>
         <!-- Values: {DRAFT | PUBLISHED | INTERNAL | DEPRECATED | SUPERCEDED} -->
-        <status>DRAFT</status>
+        <status>PUBLISHED</status>
         <categories>security</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
diff --git a/system/AppUsageStatistics/template-params.xml b/system/AppUsageStatistics/template-params.xml
index 38f5781..dc8b46f 100644
--- a/system/AppUsageStatistics/template-params.xml
+++ b/system/AppUsageStatistics/template-params.xml
@@ -36,7 +36,7 @@
     <template src="base" />
 
     <metadata>
-        <status>DRAFT</status>
+        <status>PUBLISHED</status>
         <categories>System</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
diff --git a/system/RuntimePermissions/template-params.xml b/system/RuntimePermissions/template-params.xml
index c766f9b..c61c8d2 100644
--- a/system/RuntimePermissions/template-params.xml
+++ b/system/RuntimePermissions/template-params.xml
@@ -39,7 +39,7 @@
     <common src="logger"/>
 
     <metadata>
-        <status>DRAFT</status>
+        <status>PUBLISHED</status>
         <categories>System</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
diff --git a/system/RuntimePermissionsBasic/template-params.xml b/system/RuntimePermissionsBasic/template-params.xml
index c5852ed..aba6ac8 100644
--- a/system/RuntimePermissionsBasic/template-params.xml
+++ b/system/RuntimePermissionsBasic/template-params.xml
@@ -36,7 +36,7 @@
     <template src="base"/>
 
     <metadata>
-        <status>DRAFT</status>
+        <status>PUBLISHED</status>
         <categories>System</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
diff --git a/ui/window/DragAndDropAcrossApps/template-params.xml b/ui/window/DragAndDropAcrossApps/template-params.xml
index 6b02e61..9d23225 100644
--- a/ui/window/DragAndDropAcrossApps/template-params.xml
+++ b/ui/window/DragAndDropAcrossApps/template-params.xml
@@ -17,7 +17,7 @@
 
 <sample>
     <name>DragAndDropAcrossApps-new</name>
-    <group>ui</group> 
+    <group>ui</group>
     <package>com.example.android.droptarget</package>
 
     <minSdk>24</minSdk>
@@ -27,7 +27,7 @@
     <strings>
         <intro>
 <![CDATA[
-This sample demonstrates how data can be moved between views within an 
+This sample demonstrates how data can be moved between views within an
 app or between different apps via drag and drop.
 This sample contains two separate Android applications: DragSource and
 DropTarget. DragSource contains images and text that can be dropped into the DropTarget
@@ -41,8 +41,8 @@
     </strings>
 
     <metadata>
-        <status>DRAFT</status>
-        <categories>Android N Preview</categories>
+        <status>PUBLISHED</status>
+        <categories>UI</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
         <solutions>Mobile</solutions>
@@ -75,15 +75,15 @@
         <intro>
 <![CDATA[
 Android N introduces support for drag and drop between applications,
-augmenting the existing APIs that have enabled this within a single 
+augmenting the existing APIs that have enabled this within a single
 window before.
 
-To start a drag operation you need to call `View.startDragAndDrop`. 
+To start a drag operation you need to call `View.startDragAndDrop`.
 Which gesture or action triggers this is up to you as an app developer.
-The API guide recommends doing this from 
+The API guide recommends doing this from
 `View.OnLongClickListener.onLongClick` and this seems to be the de-facto
-standard, but you are free to use other gestures (single tap, tap and drag 
-etc). 
+standard, but you are free to use other gestures (single tap, tap and drag
+etc).
 However, if you go for a unconventional drag start gesture, note that
 the framework implementation assumes that the pointer (touch or mouse)
 is down while the drag is starting, and the most recent touch/click
@@ -95,16 +95,16 @@
 
 By default a drag and drop operation is constrained by the window
 containing the view that started the drag.
-To enable cross-window and cross-app drag and drop add 
+To enable cross-window and cross-app drag and drop add
 `View.DRAG_FLAG_GLOBAL` to the flags passed to the `View.startDragAndDrop`
-call. 
+call.
 
-If a Uri requiring permission grants is being sent, then the 
-`android.view.View.DRAG_FLAG_GLOBAL_URI_READ` and/or the 
+If a Uri requiring permission grants is being sent, then the
+`android.view.View.DRAG_FLAG_GLOBAL_URI_READ` and/or the
 `android.view.View.DRAG_FLAG_GLOBAL_URI_WRITE` flags must be used also.
 To access content URIs requiring permissions on the receiving side, the target
 app needs to request the `android.view.DropPermissions` from the activity via
-`android.app.Activity.requestDropPermissions`. This permission will stay either 
+`android.app.Activity.requestDropPermissions`. This permission will stay either
 until the activity is alive, or until the `release()` method is called on the
 `android.view.DropPermissions` object.
 ]]>
diff --git a/ui/window/MultiWindowPlayground/template-params.xml b/ui/window/MultiWindowPlayground/template-params.xml
index 3c85054..01ba989 100644
--- a/ui/window/MultiWindowPlayground/template-params.xml
+++ b/ui/window/MultiWindowPlayground/template-params.xml
@@ -17,7 +17,7 @@
 
 <sample>
     <name>MultiWindowPlayground</name>
-    <group>Android N Preview</group>
+    <group>UI</group>
     <package>com.example.android.multiwindowplayground</package>
 
     <minSdk>24</minSdk>
@@ -40,7 +40,7 @@
 
     <metadata>
         <status>PUBLISHED</status>
-        <categories>Android N Preview</categories>
+        <categories>UI</categories>
         <technologies>Android</technologies>
         <languages>Java</languages>
         <solutions>Mobile</solutions>