diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/land_back.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/land_back.png
new file mode 100644
index 0000000000000..6407fbee6a30d
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/land_back.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/land_fore.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/land_fore.png
new file mode 100644
index 0000000000000..b831f482c5d24
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/land_fore.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/land_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/land_shadow.png
new file mode 100644
index 0000000000000..79b5930e0a4c0
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/land_shadow.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/port_back.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/port_back.png
new file mode 100644
index 0000000000000..33691b24bee46
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/port_back.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/port_fore.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/port_fore.png
new file mode 100644
index 0000000000000..c227a925ec7f3
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/port_fore.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/port_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/port_shadow.png
new file mode 100644
index 0000000000000..3a19d6fe17688
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/port_shadow.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/thumb.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/thumb.png
new file mode 100644
index 0000000000000..4f56fee048ace
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_5x/thumb.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/land_back.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/land_back.png
new file mode 100644
index 0000000000000..3495b13b05f25
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/land_back.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/land_fore.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/land_fore.png
new file mode 100644
index 0000000000000..e8c74134a2741
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/land_fore.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/land_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/land_shadow.png
new file mode 100644
index 0000000000000..e88906b9e45e4
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/land_shadow.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/port_back.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/port_back.png
new file mode 100644
index 0000000000000..9c311fd19b683
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/port_back.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/port_fore.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/port_fore.png
new file mode 100644
index 0000000000000..442ab87a55224
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/port_fore.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/port_shadow.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/port_shadow.png
new file mode 100644
index 0000000000000..4b4e526e97669
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/port_shadow.png differ
diff --git a/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/thumb.png b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/thumb.png
new file mode 100644
index 0000000000000..5ef009850210e
Binary files /dev/null and b/docs/html/distribute/tools/promote/device-art-resources/nexus_6p/thumb.png differ
diff --git a/docs/html/distribute/tools/promote/device-art.jd b/docs/html/distribute/tools/promote/device-art.jd
index d321074a9c5af..f1986fa9401b5 100644
--- a/docs/html/distribute/tools/promote/device-art.jd
+++ b/docs/html/distribute/tools/promote/device-art.jd
@@ -186,7 +186,7 @@ feature image or screenshots for your Google Play app listing.</p>
     {
       id: 'nexus_5',
       title: 'Nexus 5',
-      url: 'http://www.google.com/nexus/5/',
+      url: 'https://www.google.com/nexus/5/',
       physicalSize: 5,
       physicalHeight: 5.43,
       density: 'XXHDPI',
@@ -195,11 +195,25 @@ feature image or screenshots for your Google Play app listing.</p>
       portRes: ['shadow', 'back', 'fore'],
       portOffset: [304,436],
       portSize: [1080,1920],
+      archived: true
+    },
+    {
+      id: 'nexus_5x',
+      title: 'Nexus 5X',
+      url: 'https://www.google.com/nexus/5x/',
+      physicalSize: 5.2,
+      physicalHeight: 5.625,
+      density: '420DPI',
+      landRes: ['shadow', 'back', 'fore'],
+      landOffset: [485,313],
+      portRes: ['shadow', 'back', 'fore'],
+      portOffset: [305,485],
+      portSize: [1080,1920],
     },
     {
       id: 'nexus_6',
       title: 'Nexus 6',
-      url: 'http://www.google.com/nexus/6/',
+      url: 'https://www.google.com/nexus/6/',
       physicalSize: 6,
       physicalHeight: 6.27,
       density: '560DPI',
@@ -207,26 +221,26 @@ feature image or screenshots for your Google Play app listing.</p>
       landOffset: [489,327],
       portRes: ['shadow', 'back', 'fore'],
       portOffset: [327,489],
-      portSize: [1440, 2560],
+      portSize: [1440, 2560], 
+      archived: true
     },
     {
-      id: 'nexus_7',
-      title: 'Nexus 7',
-      url: 'http://www.google.com/nexus/7/',
-      physicalSize: 7,
-      physicalHeight: 8,
-      actualResolution: [1200,1920],
-      density: 'XHDPI',
+      id: 'nexus_6p',
+      title: 'Nexus 6P',
+      url: 'https://www.google.com/nexus/6p/',
+      physicalSize: 5.7,
+      physicalHeight: 6.125,
+      density: '560DPI',
       landRes: ['shadow', 'back', 'fore'],
-      landOffset: [326,245],
+      landOffset: [579,321],
       portRes: ['shadow', 'back', 'fore'],
-      portOffset: [244,326],
-      portSize: [800,1280]
+      portOffset: [312,579],
+      portSize: [1440, 2560],
     },
     {
       id: 'nexus_9',
       title: 'Nexus 9',
-      url: 'http://www.google.com/nexus/9/',
+      url: 'https://www.google.com/nexus/9/',
       physicalSize: 9,
       physicalHeight: 8.98,
       actualResolution: [1536,2048],
@@ -240,7 +254,7 @@ feature image or screenshots for your Google Play app listing.</p>
     {
       id: 'nexus_10',
       title: 'Nexus 10',
-      url: 'http://www.google.com/nexus/10/',
+      url: 'https://www.google.com/nexus/10/',
       physicalSize: 10,
       physicalHeight: 7,
       actualResolution: [1600,2560],
@@ -255,7 +269,7 @@ feature image or screenshots for your Google Play app listing.</p>
     {
       id: 'nexus_7_2012',
       title: 'Nexus 7 (2012)',
-      url: 'http://www.google.com/nexus/7/',
+      url: 'https://www.google.com/nexus/7/',
       physicalSize: 7,
       physicalHeight: 7.81,
       density: '213dpi',
@@ -269,7 +283,7 @@ feature image or screenshots for your Google Play app listing.</p>
     {
       id: 'nexus_4',
       title: 'Nexus 4',
-      url: 'http://www.google.com/nexus/4/',
+      url: 'https://www.google.com/nexus/4/',
       physicalSize: 4.7,
       physicalHeight: 5.27,
       density: 'XHDPI',
@@ -283,7 +297,7 @@ feature image or screenshots for your Google Play app listing.</p>
     {
       id: 'wear',
       title: 'Android Wear',
-      url: 'http://www.android.com/wear/',
+      url: 'https://www.android.com/wear/',
       physicalSize: 1.8,
       physicalHeight: 1.8,
       density: 'HDPI',
@@ -296,7 +310,7 @@ feature image or screenshots for your Google Play app listing.</p>
     {
       id: 'wear_square',
       title: 'Android Wear Square',
-      url: 'http://www.android.com/wear/',
+      url: 'https://www.android.com/wear/',
       physicalSize: 1.8,
       physicalHeight: 1.8,
       density: 'HDPI',
@@ -310,7 +324,7 @@ feature image or screenshots for your Google Play app listing.</p>
     {
       id: 'wear_round',
       title: 'Android Wear Round',
-      url: 'http://www.android.com/wear/',
+      url: 'https://www.android.com/wear/',
       physicalSize: 1.8,
       physicalHeight: 1.8,
       density: 'HDPI',