diff --git a/sensors/BatchStepSensor/packaging.yaml b/sensors/BatchStepSensor/packaging.yaml
index 1002b36..c78b852 100644
--- a/sensors/BatchStepSensor/packaging.yaml
+++ b/sensors/BatchStepSensor/packaging.yaml
@@ -11,5 +11,5 @@
 solutions:    [Mobile]
 github:       googlesamples/android-BatchStepSensor
 level:        BEGINNER
-icon:         BatchStepSensorSample/src/main/res/drawable-xxhdpi/ic_launcher.png
+icon:         BatchStepSensorSample/screenshots/big_icon.png
 license:      apache2-android
diff --git a/sensors/BatchStepSensor/screenshots/big_icon.png b/sensors/BatchStepSensor/screenshots/big_icon.png
new file mode 100644
index 0000000..7f06890
--- /dev/null
+++ b/sensors/BatchStepSensor/screenshots/big_icon.png
Binary files differ
diff --git a/sensors/BatchStepSensor/screenshots/screenshot1.png b/sensors/BatchStepSensor/screenshots/screenshot1.png
new file mode 100644
index 0000000..3c202a5
--- /dev/null
+++ b/sensors/BatchStepSensor/screenshots/screenshot1.png
Binary files differ
diff --git a/sensors/BatchStepSensor/screenshots/screenshot2.png b/sensors/BatchStepSensor/screenshots/screenshot2.png
new file mode 100644
index 0000000..84865c2
--- /dev/null
+++ b/sensors/BatchStepSensor/screenshots/screenshot2.png
Binary files differ
diff --git a/sensors/BatchStepSensor/screenshots/screenshot3.png b/sensors/BatchStepSensor/screenshots/screenshot3.png
new file mode 100644
index 0000000..402ea41
--- /dev/null
+++ b/sensors/BatchStepSensor/screenshots/screenshot3.png
Binary files differ
diff --git a/sensors/BatchStepSensor/screenshots/screenshot4.png b/sensors/BatchStepSensor/screenshots/screenshot4.png
new file mode 100644
index 0000000..17043a9
--- /dev/null
+++ b/sensors/BatchStepSensor/screenshots/screenshot4.png
Binary files differ
diff --git a/sensors/BatchStepSensor/screenshots/screenshot5.png b/sensors/BatchStepSensor/screenshots/screenshot5.png
new file mode 100644
index 0000000..c448d03
--- /dev/null
+++ b/sensors/BatchStepSensor/screenshots/screenshot5.png
Binary files differ
diff --git a/sensors/BatchStepSensor/template-params.xml b/sensors/BatchStepSensor/template-params.xml
index a07579d..d43c877 100644
--- a/sensors/BatchStepSensor/template-params.xml
+++ b/sensors/BatchStepSensor/template-params.xml
@@ -14,33 +14,27 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
-
-
 <sample>
     <name>BatchStepSensor</name>
     <group>Sensors</group>
     <package>com.example.android.batchstepsensor</package>
-
-
-
     <!-- change minSdk if needed-->
     <minSdk>19</minSdk>
-
-
     <strings>
         <intro>
             <![CDATA[
-            This sample demonstrates the use of the two step sensors (step detector and counter) and
-            sensor batching.\n\n It shows how to register a SensorEventListener with and without
-            batching and shows how these events are received.\n\nThe Step Detector sensor fires an
+            <p>This sample demonstrates the use of the two step sensors (step detector and counter) and
+            sensor batching.</p>
+            <p>It shows how to register a SensorEventListener with and without
+            batching and shows how these events are received.</p>
+            <p>The Step Detector sensor fires an
             event when a step is detected, while the step counter returns the total number of
             steps since a listener was first registered for this sensor.
             Both sensors only count steps while a listener is registered. This sample only covers the
             basic case, where a listener is only registered while the app is running. Likewise,
             batched sensors can be used in the background (when the CPU is suspended), which
             requires manually flushing the sensor event queue before it overflows, which is not
-            covered in this sample.
+            covered in this sample.</p>
             ]]>
         </intro>
     </strings>
@@ -49,5 +43,54 @@
     <template src="CardStream"/>
     <common src="logger"/>
     <common src="activities"/>
+    <metadata>
+    <status>PUBLISHED</status>
+    <categories>Sensors</categories>
+    <technologies>Android</technologies>
+    <languages>Java</languages>
+    <solutions>Mobile</solutions>
+    <level>BEGINNER</level>
+    <icon>screenshots/big_icon.png</icon>
+    <screenshots>
+        <img>screenshots/screenshot1.png</img>
+        <img>screenshots/screenshot2.png</img>
+        <img>screenshots/screenshot3.png</img>
+        <img>screenshots/screenshot4.png</img>
+        <img>screenshots/screenshot5.png</img>
+        <img>screenshots/screenshot6.png</img>
+      </screenshots>
+    <api_refs>
+        <android>android.hardware.Sensor</android>
+        <android>android.hardware.SensorEvent</android>
+        <android>android.hardware.SensorEventListener</android>
+        <android>android.hardware.SensorManager</android>
+    </api_refs>
+    <description>
+        Sample demonstrating how to set up SensorEventListeners for step
+        detectors and step counters.
+    </description>
+
+    <intro>
+    This sample demonstrates the use of the two step [sensors][1] (step detector and counter) and
+    sensor batching.
+
+    It shows how to register a [SensorEventListener][2] with and without
+    batching and shows how these events are received.
+
+    The Step Detector sensor fires an
+    event when a step is detected, while the step counter returns the total number of
+    steps since a listener was first registered for this sensor.
+
+    Both sensors only count steps while a listener is registered. This sample only covers the
+    basic case, where a listener is only registered while the app is running. Likewise,
+    batched sensors can be used in the background (when the CPU is suspended), which
+    requires manually flushing the [sensor event][3] queue before it overflows, which is not
+    covered in this sample.
+
+    [1]: https://developer.android.com/reference/android/hardware/Sensor.html
+    [2]: https://developer.android.com/reference/android/hardware/SensorEventListener.html
+    [3]: https://developer.android.com/reference/android/hardware/SensorEvent.html
+    </intro>
+</metadata>
 
 </sample>