diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 7c56a69..9707c99 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -25,7 +25,7 @@
           <span class="dac-sprite dac-auto-chevron"></span>
           Set up Android Studio
         </a><br>
-        <a class="dac-hero-cta" href="{@docRoot}training/basics/training/index.html">
+        <a class="dac-hero-cta" href="{@docRoot}training/index.html">
           <span class="dac-sprite dac-auto-chevron"></span>
           Build your first app
         </a><br>
diff --git a/docs/html/distribute/analyze/understand-user-value.jd b/docs/html/distribute/analyze/understand-user-value.jd
index e561941..99fd11a 100644
--- a/docs/html/distribute/analyze/understand-user-value.jd
+++ b/docs/html/distribute/analyze/understand-user-value.jd
@@ -45,7 +45,8 @@
 </p>
 
 
-<h2 id="audiencereporting">Know your users with Audience Reporting and Demographic and Interest reports</h2>
+<h2 id="audiencereporting">Know your users with Audience Reporting and Demographic 
+and Interest reports</h2>
 
 <p>
   Google Analytics’ <strong>Audience Reporting</strong> section highlights a
diff --git a/docs/html/distribute/engage/ads.jd b/docs/html/distribute/engage/ads.jd
index ad6940f..10dbea6 100644
--- a/docs/html/distribute/engage/ads.jd
+++ b/docs/html/distribute/engage/ads.jd
@@ -19,13 +19,13 @@
 
 <div class="wrap">
   <div class="cols" style="margin-top:2em;">
-    <div class="col-1of2">
+    <div class="col-6of16">
    <h3>From search</h3>
    <img src="/images/distribute/promote_ads.png">
     <p class="figure-caption">Add deep links to your app, then bring users straight
     to relevant app content when they’re searching.</p>
     </div>
-    <div class="col-1of2">
+    <div class="col-6of16">
     <h3>From apps</h3>
     <img src="/images/distribute/promote_ads_inapp.png">
     <p class="figure-caption">Use remarketing and deep links to bring users to just the right
diff --git a/docs/html/distribute/engage/community.jd b/docs/html/distribute/engage/community.jd
index e202d54..689f0a8 100644
--- a/docs/html/distribute/engage/community.jd
+++ b/docs/html/distribute/engage/community.jd
@@ -26,7 +26,8 @@
 </p>
 
 <p>
-  Learn more about how to <a href="{@docRoot}distribute/users/build-community.html">build and manage a community</a>.
+  Learn more about how to <a href="{@docRoot}distribute/users/build-community.html">build
+  and manage a community</a>.
 </p>
 
 <p style="clear:both">
diff --git a/docs/html/distribute/engage/engage_toc.cs b/docs/html/distribute/engage/engage_toc.cs
index f8607f5..e146056 100644
--- a/docs/html/distribute/engage/engage_toc.cs
+++ b/docs/html/distribute/engage/engage_toc.cs
@@ -32,13 +32,13 @@
   <li class="nav-section">
     <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs
         var:toroot?>distribute/engage/ads.html">
-        <span class="en">Drive engagement with Ads</span></a>
+        <span class="en">Drive Engagement with Ads</span></a>
     </div>
   </li>
   <li class="nav-section">
     <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs
         var:toroot?>distribute/engage/intents.html">
-        <span class="en">Use the Power of Intents</span></a>
+        <span class="en">Increase Usage through Intents</span></a>
     </div>
   </li>
   <li class="nav-section">
diff --git a/docs/html/distribute/engage/gcm.jd b/docs/html/distribute/engage/gcm.jd
index 7d9b6bb..55bd40a 100644
--- a/docs/html/distribute/engage/gcm.jd
+++ b/docs/html/distribute/engage/gcm.jd
@@ -1,12 +1,12 @@
 page.title=Integrate Google Cloud Messaging
 page.metaDescription=Keep your users in sync with your latest content by delivering lightweight messages over Google's infrastructure.
 page.tags="gcm"
-page.image=/images/gcm/gcm-logo.png
+page.image=/images/cards/card-google-cloud-messaging_16-9_2x.png
 
 @jd:body
 
-<div class="figure" style="width:330px">
-  <img src="{@docRoot}images/gcm/gcm-logo.png">
+<div class="figure">
+  <img src="{@docRoot}images/cards/card-google-cloud-messaging_16-9_2x.png">
 </div>
 
 <p>
diff --git a/docs/html/distribute/engage/intents.jd b/docs/html/distribute/engage/intents.jd
index e8e49d9..07791e8 100644
--- a/docs/html/distribute/engage/intents.jd
+++ b/docs/html/distribute/engage/intents.jd
@@ -1,6 +1,6 @@
-page.title=Drive Discovery through Intents
-page.metaDescription=Make your app available to users as they perform tasks in other apps through Intents. 
-page.tags="engagement"
+page.title=Increase Usage with Android Intents
+page.metaDescription=Use Android Intents to make your app available to users as they perform tasks in other apps. 
+page.tags="engagement, intents"
 @jd:body
 
 <p>Let the user choose <em>your app</em> to handle specific tasks from another app,
@@ -16,8 +16,9 @@
 your users to make full use of your app’s features, it can help them discover
 features they didn’t know it supported.</p>
 
-<p>To learn about all the ways you can use Intents, check out <a
-href="{@docRoot}guide/components/intents-filters.html">Intents and Intent Filters</a>.</p>
+<p>Get started with <a
+href="{@docRoot}training/basics/intents/index.html">Interacting with Other Apps</a>
+training.</p>
 
 <h2 id=tips>Tips</h2>
 
diff --git a/docs/html/distribute/googleplay/developer-console.jd b/docs/html/distribute/googleplay/developer-console.jd
index 748c1d1..7631980 100644
--- a/docs/html/distribute/googleplay/developer-console.jd
+++ b/docs/html/distribute/googleplay/developer-console.jd
@@ -121,8 +121,8 @@
 </div>
 
 <p>
-  If you want to sell apps or in-app products, link your Google Wallet Merchant
-  Account to your developer profile. Google Play uses the linked merchant
+  If you want to sell apps or in-app products, link your Google payments merchant
+  account to your developer profile. Google Play uses the linked merchant
   account for financial and tax identification, as well as for monthly payouts
   from sales.
 </p>
diff --git a/docs/html/distribute/googleplay/edu/about.jd b/docs/html/distribute/googleplay/edu/about.jd
index 36a67b26..050097d 100644
--- a/docs/html/distribute/googleplay/edu/about.jd
+++ b/docs/html/distribute/googleplay/edu/about.jd
@@ -3,7 +3,6 @@
 page.metaDescription=Distribute your educational app directly to educators and schools.
 meta.tags="gpfe, googleplay, distribution, edu"
 page.tags="education"
-Xnonavpage=true
 
 @jd:body
 
@@ -14,6 +13,10 @@
   classroom.
 </p>
 
+
+<img src="{@docRoot}distribute/images/about-play-education.jpg">
+
+
 <p>
   Teachers can search for approved apps by grade, subject and standard,
   including Common Core State Standards. They can bulk purchase and pay using a
@@ -27,77 +30,125 @@
   visibility with the right audiences, without having to knock on school doors.
 </p>
 
-<div style="margin:30px 0 20px 0;" class="clearfloat dynamic-grid">
-  <div style="width:48%; margin-right:2%; float:left;">
-    <div class="centered-full-image">
-      <img src="{@docRoot}images/gpfe-developer.png">
-    </div>
-
-
-
 <div class="wrap">
   <div class="cols" style="margin-top:2em;">
     <div class="col-6of12">
-      <h2 id="maximize_your_ad_revenue">For developers</h2>
+      <h2 id="developers">
+        For developers
+      </h2>
       <img src="{@docRoot}images/gpfe-developer.png">
-      <h5>Get discovered</h5>
-      <p>With Google Play for Education, teachers and administrators can browse
-      content by curriculum, grade, and standard &mdash; discovering the right
-      content for their students. If your app offers an exciting new way to
-      learn sixth grade algebra, math educators will be able to find, purchase,
-      and distribute your app to their classes in a few clicks.</p>
-      <h5>Reach more schools and students</h5>
-    <p>
-      Millions of students, faculty, and staff are using Google Apps for
-      Education and other Google services. Many of these schools are excited to
-      take advantage of tablets with Google Play for Education and they are
-      looking to bring your apps into their classrooms, especially apps using
-      Google sign-on.
-    </p>
-      <h5>Monetize effectively</h5>
-    <p>
-      With Google Play for Education, educators are able to make high-volume
-      purchases using standard institutional payment mechanisms and then
-      distribute apps to the students who need them — whether it’s a class of
-      20 or a district of 20,000.
-    </p>
+      <h5>
+        Get discovered
+      </h5>
+
+      <p>
+        With Google Play for Education, teachers and administrators can browse
+        content by curriculum, grade, and standard &mdash; discovering the
+        right content for their students. If your app offers an exciting new
+        way to learn sixth grade algebra, math educators will be able to find,
+        purchase, and distribute your app to their classes in a few clicks.
+      </p>
+
+      <h5>
+        Reach more schools and students
+      </h5>
+
+      <p>
+        Millions of students, faculty, and staff are using Google Apps for
+        Education and other Google services. Many of these schools are excited
+        to take advantage of tablets with Google Play for Education and they
+        are looking to bring your apps into their classrooms, especially apps
+        using Google sign-on.
+      </p>
+
+      <h5>
+        Monetize effectively
+      </h5>
+
+      <p>
+        With Google Play for Education, educators are able to make high-volume
+        purchases using standard institutional payment mechanisms and then
+        distribute apps to the students who need them — whether it’s a class of
+        20 or a district of 20,000.
+      </p>
+
+      <h5>
+        Continue to offer in app-purchases
+      </h5>
+
+      <p>
+        You can continue to offer free apps with in-app purchases. Business
+        employees will be able to make purchases just as they would if they
+        personally installed your app.
+      </p>
+
+      <h5>
+        New monetization opportunities
+      </h5>
+
+      <p>
+        Businesses will often look for extended support for business critical
+        apps, and you have the opportunity to offer that support for a fee.
+      </p>
     </div>
 
-
     <div class="col-6of12">
-      <h2 id="maximize_your_ad_revenue">For educators</h2>
+      <h2 id="educators">
+        For educators
+      </h2>
       <img src="{@docRoot}images/gpfe-educator.png">
-      <h5>    <b>Android tablets in the classroom</h5>
-    <p>
-      Google Play for Education brings the innovation of Android technology
-      into classrooms. School districts can set up and deploy large numbers of
-      devices in just minutes or hours, rather than days.
-    </p>
-      <h5>Curriculum-based discovery</h5>
-    <p>
-      Powerful browsing tools let educators quickly discover apps, videos, and
-      other content—with many recommended by teachers and categorized according
-      to familiar Core Curriculum standards.
-    </p>
-      <h5>Bulk purchase with institutional payment</h5>
-    <p>
-      Convenient purchasing and delivery tools let educators buy apps in bulk,
-      using purchase orders and other payment methods that are easy for schools
-      to manage.
-    </p>
-      <h5>Over-the-air delivery to student devices</h5>
-    <p>
-      After finding apps they want, educators can push them instantly to
-      student devices over the air. They can send the apps to individuals or
-      groups of any size, across classrooms, schools, or even districts.
-    </p>
-      <h5>Business-wide licensing</h5>
-      <p>Paid apps are licensed to your organization, enabling you to move paid apps between users as users needs change and staff turns over. </p>
+      <h5>
+        Android tablets in the classroom
+      </h5>
+
+      <p>
+        Google Play for Education brings the innovation of Android technology
+        into classrooms. School districts can set up and deploy large numbers
+        of devices in just minutes or hours, rather than days.
+      </p>
+
+      <h5>
+        Curriculum-based discovery
+      </h5>
+
+      <p>
+        Powerful browsing tools let educators quickly discover apps, videos,
+        and other content—with many recommended by teachers and categorized
+        according to familiar Core Curriculum standards.
+      </p>
+
+      <h5>
+        Bulk purchase with institutional payment
+      </h5>
+
+      <p>
+        Convenient purchasing and delivery tools let educators buy apps in
+        bulk, using purchase orders and other payment methods that are easy for
+        schools to manage.
+      </p>
+
+      <h5>
+        Over-the-air delivery to student devices
+      </h5>
+
+      <p>
+        After finding apps they want, educators can push them instantly to
+        student devices over the air. They can send the apps to individuals or
+        groups of any size, across classrooms, schools, or even districts.
+      </p>
+
+      <h5>
+        Business-wide licensing
+      </h5>
+
+      <p>
+        Paid apps are licensed to your organization, enabling you to move paid
+        apps between users as users needs change and staff turns over.
+      </p>
     </div>
   </div>
 </div>
 
-
 <h2 id="related-resources">Related Resources</h2>
 
 
diff --git a/docs/html/distribute/googleplay/families/about.jd b/docs/html/distribute/googleplay/families/about.jd
index 5a15490..9156e5c 100644
--- a/docs/html/distribute/googleplay/families/about.jd
+++ b/docs/html/distribute/googleplay/families/about.jd
@@ -6,7 +6,7 @@
 
 @jd:body
 
-<p>
+    <p>
   If you got great apps targeting kids and/or families, the family-focused experience
   on Google Play is a great way to make them discoverable by parents.
 </p>
@@ -28,67 +28,62 @@
   store.
 </p>
 
+
 <h2 id="benefits">Benefits</h2>
 
+    <div class="figure" style="width:300px;">
+
+     <img src="{@docRoot}images/distribute/dff-browse.png" style="width:300px">
+     <p class="figure-caption" style="text-align:center">Browse gives you improved visibility to families.</p>
+   </div>
+   
 <p>
   By opting-in to Designed for Families, parents can easily find your family-friendly
   content on the Google Play store however they are accessing it.
 </p>
 
-<h3>Search</h3> 
 
-<p>
-  Only content opted-in to the Designed for Families program will show up in search results
-  from any of the family sections. This is a huge boost to this content as a majority of
-  searches on the Play Store containing the terms “apps for” or “games for” are related to
-  kids.
-</p>
 
-<h3>Browse</h3>
+      <h3>Search</h3>
+        <p>Only apps and games opted-in to the Designed for Families program will show up in searches initiated from the Family section in Apps Home. They’ll also be more visible when users search for family or kid related content from anywhere in the Play store.</p>
+  
+      <h3>Browse</h3>
+        <p>The Family star button on Apps and Games Home points to an enhanced discovery experience for parents looking for family appropriate content. The new Family section includes uniquely merchandised content, new categories, and age-based browsing. Participating apps will receive this additional visibility on top of their existing categories, rankings, and reviews elsewhere on the Google Play store.</p>
 
-<p>
-  Family sections within Apps, Games, Movies & TV and Music provide enhanced discovery for
-  parents. These sections act as true home pages and contain unique categories tailored to kids
-  content, specific age-based categories, and merchandised content.
-</p>
 
-<h3>Character pages</h3>
 
-<p>
-  All content for particular popular characters can now be found in one place on character pages,
-  including apps, games, movies, tv, and books. It’s a powerful way to promote children’s brands
-  across content, and allows you to reach a highly relevant and targeted audience. Character
-  pages are also a way to alleviate concerns around IP protection, since only properly licensed
-  content is on these pages. 
-</p>
 
-<h3>Merchandising</h3>
+      <h3>Character pages</h3>
 
-<p>
-  The family sections have their own merchandised content, with new opportunities for featuring
-  on the home pages of the family sections and and within the age-specific home pages. The pages
-  are curated to ensure quality and limited to only content opted-in to Designed for Families
-  and appropriate for specific age ranges.
-</p>
 
-<h3>Badging</h3>
+    <div class="figure" style="width:300px;">
 
-<p>
-  Apps opted-in to Designed for Families will receive family-friendly badges, which are a marker
-  of quality and signal to parents that apps are suitable for users of specific ages groups.
-  Clicking on a badge also leads you to other apps and games with that badge. 
-</p>
+     <img src="{@docRoot}images/distribute/dff-character.png" style="width:300px">
+     <p class="figure-caption" style="text-align:center">Character pages let parents disover your content based on familiar brands and characters.</p>
+   </div>
+
+
+      <p>Parents can now discover content for popular characters from around the globe in one place, including apps, games, movies, tv shows, books, and even music. This provides a powerful way for parents to discover content from familiar  brands and beloved characters, and allows you to reach a highly relevant and targeted audience. </p>
+
+      <h3>Merchandising</h3>
+        <p>The family sections include their own merchandised collections. The themed collections on these pages are curated to ensure quality and limited only to content accepted into the Designed for Families program.</p>
+
+      <h3>Badging</h3>
+        <p>Apps participating in Designed for Families are marked with the family star badge, which reflects the target age you select for your apps and serves as a signal of quality for parents.</p>
+
+
+    <div class="figure" style="width:300px;">
+
+     <img src="{@docRoot}images/distribute/dff-badging.png" style="width:300px">
+     <p class="figure-caption" style="text-align:center">Participating apps are marked with the family star badge.</p>
+   </div>
+
 
 <h2 id="elibibility">Eligibility</h2>
 
 <p>
-  Apps in the family-friendly experience on Google Play are more
-  discoverable by parents and families, who expect the apps to appeal to kids under 13 and be age
-  appropriate. The Designed for Families program is designed to be inclusive of
-  apps that are made for kids as well as those that can be enjoyed by the
-  entire family. To address this audience, there are specific guidelines and
-  policies your apps need to meet, which will be assessed in an app content
-  review.
+The Designed for Families program is designed to be inclusive of apps that are made for kids as well as those that can be enjoyed by the entire family. General audience apps that have no specific benefit or relevance for audiences under the age of thirteen will not be accepted into the program. To participate, there are specific guidelines and policies your apps need to meet, which are assessed in an app content review.
+
 </p>
 
 <p>
@@ -105,11 +100,16 @@
 <p>
   Your app must also meet the <a href=
   "https://support.google.com/googleplay/android-developer/answer/6184502">Designed
-  for Families program requirements</a> listed in the Google Play Developer
-  Help Center.
+  for Families program requirements</a>.
 </p>
 
-<div class="paging-links" style="padding-top:.75em;">
-  <a href="{@docRoot}distribute/googleplay/families/start.html" class=
-  "next-class-link">Next: Opt-In</a>
-</div>
+<p>
+To learn how to opt-in and find more details about the program, visit the Google Play Developer <a href="https://support.google.com/googleplay/android-developer/answer/6231938">Help Center</a>.
+
+<h2 id="contact">Stay in Touch</h2>
+
+<p>If you'd like to receive occasional emails with news relating to the Designed for Families
+program and Google Play opportunities, sign up using the <a
+href="https://docs.google.com/forms/d/1EtvUWqlkxS6RxHJjeI-3-7uzdbIZx6n9Cocy2D369B8/viewform">Dssigned
+for Families Interest Form</a>
+</p>
\ No newline at end of file
diff --git a/docs/html/distribute/googleplay/googleplay_toc.cs b/docs/html/distribute/googleplay/googleplay_toc.cs
index e348ee2..0eef721 100644
--- a/docs/html/distribute/googleplay/googleplay_toc.cs
+++ b/docs/html/distribute/googleplay/googleplay_toc.cs
@@ -49,26 +49,15 @@
   </li>
   <li class="nav-section">
     <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/cardboard.html">
-          <span class="en"><span style="white-space:nowrap">Build VR with Google Cardboard</span></span>
+          <span class="en">Build VR with <span style="white-space:nowrap">Google Cardboard</span></span>
         </a>
     </div>
   </li>
   <li class="nav-section">
-    <div class="nav-section-header" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/families/about.html">
+    <div class="nav-section-header empty" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/families/about.html">
           <span class="en">Designed for Families</span>
         </a>
     </div>
-    <ul>
-      <li><a href="<?cs var:toroot?>distribute/googleplay/families/start.html">
-          <span class="en">Opt-In</span>
-        </a></li>
-      <li><a href="<?cs var:toroot?>distribute/googleplay/families/faq.html">
-          <span class="en">FAQ</span>
-        </a></li>
-      <li><a href="https://docs.google.com/forms/d/1EtvUWqlkxS6RxHJjeI-3-7uzdbIZx6n9Cocy2D369B8/viewform">
-          <span class="en">Stay in Touch »</span>
-        </a></li>
-    </ul>
   </li>
   <li class="nav-section">
     <div class="nav-section-header" style="font-weight:normal"><a href="<?cs var:toroot?>distribute/googleplay/edu/about.html">
diff --git a/docs/html/distribute/googleplay/start.jd b/docs/html/distribute/googleplay/start.jd
index 2ba5880..1b835d8 100644
--- a/docs/html/distribute/googleplay/start.jd
+++ b/docs/html/distribute/googleplay/start.jd
@@ -19,7 +19,7 @@
   <li>Registering for a Google Play publisher account
   </li>
 
-  <li>Setting up a Google Wallet Merchant Account, if you will sell apps or
+  <li>Setting up a Google payments merchant account, if you will sell apps or
   in-app products.
   </li>
 
@@ -81,8 +81,8 @@
   law.
   </li>
 
-  <li>Pay a <strong>$25 USD registration fee</strong> using Google Wallet. If
-  you don't have a Google Wallet account, you can quickly set one up during the
+  <li>Pay a <strong>$25 USD registration fee</strong> using Google payments. If
+  you don't have a Google payments account, you can quickly set one up during the
   process.
   </li>
 
@@ -93,24 +93,20 @@
 
 <div class="headerLine">
   <h2 id="merchant-account">
-    Set Up a Google Wallet Merchant Account
+    Set Up a Google Payments Merchant Account
   </h2>
 
 
 </div>
 
-<div class="figure" style="width:200px;">
-  <img src="{@docRoot}images/gp-start-wallet-icon.png">
-</div>
-
 <p>
   If you want to sell priced apps, in-app products, or subscriptions, you’ll
-  need a Google Wallet Merchant Account. You can set one up at any time, but
+  need a Google payments merchant account. You can set one up at any time, but
   first review the list of <a href=
   "https://support.google.com/googleplay/android-developer/bin/answer.py?hl=en&answer=150324">
   merchant countries</a>.<br>
   <br>
-  To set up a Google Wallet Merchant Account:<br>
+  To set up a Google payments merchant account:<br>
   <br>
 </p>
 
@@ -130,7 +126,7 @@
 </ol>
 
 <p>
-  This takes you to the Google Wallet site; you'll need information about your
+  This takes you to the Google payments site; you'll need information about your
   business to complete this step.
 </p>
 
diff --git a/docs/html/distribute/googleplay/work/about.jd b/docs/html/distribute/googleplay/work/about.jd
index 6ced561..bd0f72b 100644
--- a/docs/html/distribute/googleplay/work/about.jd
+++ b/docs/html/distribute/googleplay/work/about.jd
@@ -1,33 +1,35 @@
 page.title=Google Play for Work
 page.metaDescription=Distribute your apps directly to enterprises and business users.
-page.tags="enterprise", "emm", "business", "administrator"
-page.image=images/distribute/android-work.jpg
+page.tags="enterprise", "emm", "business", "administrator", "profile"
+page.image=images/distribute/gpfw.jpg
 @jd:body
 
 <p>Google Play for Work is an extension of Google Play that lets Android for Work users browse and install apps. IT admins in a business using Android for Work choose which public and private apps are made available to users in their business. Businesses can use Google Play for Work to securely bulk deploy free apps to their employees or bulk purchase paid apps depending on their needs.</p>
+<img src="{@docRoot}images/distribute/gpfw.jpg">
+
 
 <p>As a Google Play developer, your free apps are automatically ready to be selected by Android for Work customers and made available to their workforces on Google Play for Work. However, to allow businesses access to bulk purchase your paid apps, you must opt-in and agree to the <a href="https://play.google.com/about/work/developer-distribution-agreement-addendum.html">Google Play for Work Addendum</a> to the Developer Distribution Agreement.</p>
 
-<p>Find out more about <a href="">distributing to Google Play for Work</a>.</p>
+<p>Find out more about <a href="https://support.google.com/googleplay/work/answer/6137711">distributing to Google Play for Work</a>.</p>
 
 <div class="wrap">
   <div class="cols" style="margin-top:2em;">
     <div class="col-6of12">
-      <h2 id="maximize_your_ad_revenue">For developers</h2>
+      <h2 id="developer">For developers</h2>
       <img src="{@docRoot}images/distribute/gpfw_developer.png">
       <h5>Get discovered</h5>
       <p>Get your business related apps listed in a business specific gateway so they stand out from consumer apps.</p>
       <h5>Get volume</h5>
       <p>Reach new audiences at scale because businesses will be able to deploy your free apps in bulk. Bulk purchasing also allows businesses to buy your paid app at scale.</p>
-      <h5>Generate revenue from extended support</h5>
-      <p>Businesses will often look for extended support for business critical apps, and you have the opportunity to offer that support for a fee.</p>
       <h5>Continue to offer in app-purchases</h5>
       <p>You can continue to offer free apps with in-app purchases. Business employees will be able to make purchases just as they would if they personally installed your app. </p>
+      <h5>New monetization opportunities</h5>
+      <p>Businesses will often look for extended support for business critical apps, and you have the opportunity to offer that support for a fee.</p>
     </div>
 
 
     <div class="col-6of12">
-      <h2 id="maximize_your_ad_revenue">For businesses</h2>
+      <h2 id="business">For businesses</h2>
       <img src="{@docRoot}images/distribute/gpfw_business.png">
       <h5>Free to businesses</h5>
       <p>Google Play for Work is available free of charge to Android for Work customers.</p>
@@ -47,13 +49,13 @@
 
 <p>Keep these best practices in mind as you build a great enterprise-ready app.</p>
 
-<h3 id="design">Build a great app for business</h3>
+<h3 id="design">Develop a great app for business</h3>
 
 <ul>
   <li>Follow best practices for security and manage user data properly. Businesses
   are more conscious of data security and employee productivity, especially when it
   comes to features that share information with other services.</li>
-  <li>Support the Work App Configuration framework to let an administrator remotely configure app settings such as:
+  <li>Support the <a href="{@docRoot}training/enterprise/app-restrictions.html">App Configuration framework to let an administrator remotely configure app settings such as:
     <ul>
       <li>Server address and protocol settings</li>
       <li>The ability to switch features on and off</li>
@@ -64,20 +66,10 @@
   <li>Request the minimum permissions that your app needs.</li>
   <li>Make sure communication to your backend and data in your backend is secure.</li>
   <li>Implement authorization policies that will minimize the number of your employees that can access user data.</li>
-  <li><a href={@docRoot}training/enterprise/app-compatibility.html">Offer compatibility with managed profile</a> and test that with the <a href="{@docRoot}samples/BasicManagedProfile/index.html">BasicManagedProfile sample app</a>.</li>
+  <li><a href={@docRoot}training/enterprise/app-compatibility.html">Offer compatibility with work profile</a> and test that with the <a href="{@docRoot}samples/BasicManagedProfile/index.html">BasicManagedProfile sample app</a>.</li>
   <li>Support <a href="{@docRoot}training/enterprise/app-restrictions.html">app restrictions</a> so that IT admins can remotely configure your app through leading EMM solutions.</li>
 </ul>
 
-<!--<h3 id="distribute">Distribute</h3>
-
-<p>Free to install apps are automatically made available through Google Play for Work, but for paid apps:</p>
-
-<ul>
-<li>When you <a href="https://support.google.com/googleplay/android-developer/answer/113469">publish your app through the Developer Console</a>, opt in to distribute through Google Play for Work, so you agree to your app’s licenses being transferrable within a single business customer.</li>
-<li>Use the <a href="{@docRoot}}google/play/licensing/index.html">Licensing API to track which users have licenses assigned.</li>
-</ul> -->
-
-
 <h3 id="support">Provide support and maintenance</h3>
 
 <ul>
diff --git a/docs/html/distribute/images/freemium.jpg b/docs/html/distribute/images/freemium.jpg
deleted file mode 100644
index 6919202..0000000
--- a/docs/html/distribute/images/freemium.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/html/distribute/images/gp-app-practices.png b/docs/html/distribute/images/gp-app-practices.png
deleted file mode 100644
index 0afc4cb..0000000
--- a/docs/html/distribute/images/gp-app-practices.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/distribute/images/gp-games-practices.png b/docs/html/distribute/images/gp-games-practices.png
deleted file mode 100644
index e2b63c5..0000000
--- a/docs/html/distribute/images/gp-games-practices.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/distribute/images/premium.jpg b/docs/html/distribute/images/premium.jpg
deleted file mode 100644
index 210fddb..0000000
--- a/docs/html/distribute/images/premium.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/html/distribute/images/subscription.jpg b/docs/html/distribute/images/subscription.jpg
deleted file mode 100644
index 9b6f112..0000000
--- a/docs/html/distribute/images/subscription.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/html/distribute/monetize/ads.jd b/docs/html/distribute/monetize/ads.jd
index c15f2bb..6f55535 100644
--- a/docs/html/distribute/monetize/ads.jd
+++ b/docs/html/distribute/monetize/ads.jd
@@ -8,114 +8,202 @@
   <img src="{@docRoot}distribute/images/advertising.jpg" style="width:460px;">
 </div>
 
-<p>Ads are an effective and easy way to earn revenue from your apps. AdMob brings
-together best-in-class technology in a single ad platform for your app, so you
-can gain insights about your users, drive more in-app purchases, and maximize
-your ad revenue. You won’t need to rely on a combination of tools or use
-precious development resources to build your own solution.</p>
+<p>
+  Ads are an effective and easy way to earn revenue from your apps. AdMob
+  brings together best-in-class technology in a single ad platform for your
+  app, so you can gain insights about your users, drive more in-app purchases,
+  and maximize your ad revenue. You won’t need to rely on a combination of
+  tools or use precious development resources to build your own solution.
+</p>
 
-<p>Why choose AdMob?</p>
+<p>
+  Why choose AdMob?
+</p>
 
 <ul>
-  <li> Over 650,000 apps use AdMob
-  <li> $1 billion+ paid to developers in the last 2 years
-  <li> Fast, reliable payment in local currencies
-  <li> High CPMs and the best fill rates
-  <li> Industry-leading mediation platform
+  <li>Over 650,000 apps use AdMob
+  </li>
+
+  <li>$1 billion+ paid to developers in the last 2 years
+  </li>
+
+  <li>Fast, reliable payment in local currencies
+  </li>
+
+  <li>High CPMs and the best fill rates
+  </li>
+
+  <li>Industry-leading mediation platform
+  </li>
 </ul>
 
-<p><a href="http://www.google.com/ads/admob/#subid=us-en-et-dac">Sign-up for AdMob</a>
-today and start using the <a
-href="https://developer.android.com/google/play-services/ads.html">Google Mobile Ads SDK</a>
-in your app with a few lines of code.</p>
+<p>
+  <a href="http://www.google.com/ads/admob/#subid=us-en-et-dac">Sign-up for
+  AdMob</a> today and start using the <a href=
+  "https://developer.android.com/google/play-services/ads.html">Google Mobile
+  Ads SDK</a> in your app with a few lines of code.
+</p>
 
-<h2 id="maximize_your_ad_revenue">Maximize your ad revenue</h2>
+<h2 id="maximize_your_ad_revenue">
+  Maximize your ad revenue
+</h2>
 
 <div class="wrap">
   <div class="cols" style="margin-top:2em;">
     <div class="col-4of12">
-      <h5 id="maximize_earnings">Maximize earnings</h5>
-      <p>Earn more with our industry-leading ad service, which includes <a href=
-      "https://support.google.com/admob/answer/3063564">free mediation</a> to
-      automatically improve your earnings, and access to all of Google’s advertiser
-      demand from AdMob, AdWords, and the DoubleClick Ad Exchange.</p>
+      <h5 id="maximize_earnings">
+        Maximize earnings
+      </h5>
+
+      <p>
+        Earn more with our industry-leading ad service, which includes <a href=
+        "https://support.google.com/admob/answer/3063564">free mediation</a> to
+        automatically improve your earnings, and access to all of Google’s
+        advertiser demand from AdMob, AdWords, and the DoubleClick Ad Exchange.
+      </p>
     </div>
+
     <div class="col-4of12">
-      <h5 id="get_paid_fast">Get paid fast</h5>
-      <p>Get paid in local currencies quickly and reliably, with no wire fees charged by
-      AdMob.</p>
+      <h5 id="get_paid_fast">
+        Get paid fast
+      </h5>
+
+      <p>
+        Get paid in local currencies quickly and reliably, with no wire fees
+        charged by AdMob.
+      </p>
     </div>
+
     <div class="col-4of12">
-      <h5 id="easy_and_free">Easy and free</h5>
-      <p>The SDK can be installed quickly, and there are no standard fees for using the
-      platform.</p>
+      <h5 id="easy_and_free">
+        Easy and free
+      </h5>
+
+      <p>
+        The SDK can be installed quickly, and there are no standard fees for
+        using the platform.
+      </p>
     </div>
   </div>
 </div>
 
-<h2 id="grow_your_business_with_a_trusted_partner">Grow your business with a trusted partner</h2>
+<h2 id="grow_your_business_with_a_trusted_partner">
+  Grow your business with a trusted partner
+</h2>
+
 <div class="wrap">
   <div class="cols" style="margin-top:2em;">
     <div class="col-6of12">
-      <h5 id="powered_by_googles_ad_technology">Powered by Google’s ad technology</h5>
-      <p>For over a decade, Google has helped millions of developers grow their digital
-      businesses.</p>
+      <h5 id="powered_by_googles_ad_technology">
+        Powered by Google’s ad technology
+      </h5>
+
+      <p>
+        For over a decade, Google has helped millions of developers grow their
+        digital businesses.
+      </p>
     </div>
+
     <div class="col-6of12">
-      <h5 id="auto_updates_on_google_play">Auto updates on Google Play</h5>
-      <p>AdMob’s integration with Google Play services pushes automatic performance
-        improvements to Android apps without additional SDK changes.</p>
+      <h5 id="auto_updates_on_google_play">
+        Auto updates on Google Play
+      </h5>
+
+      <p>
+        AdMob’s integration with Google Play services pushes automatic
+        performance improvements to Android apps without additional SDK
+        changes.
+      </p>
     </div>
   </div>
 </div>
 
+<h2 id="drive_more_in-app_purchases_and_downloads">
+  Drive more in-app purchases and downloads
+</h2>
 
-<h2 id="drive_more_in-app_purchases_and_downloads">Drive more in-app purchases and downloads</h2>
 <div class="wrap">
   <div class="cols" style="margin-top:2em;">
     <div class="col-6of12">
-<h5 id="sell_more_in-app_purchases">Sell more in-app purchases</h5>
-<p>Earn more revenue by intelligently promoting your in-app purchases to the users
-most likely to buy them.</p>
+      <h5 id="sell_more_in-app_purchases">
+        Sell more in-app purchases
+      </h5>
+
+      <p>
+        Earn more revenue by intelligently promoting your in-app purchases to
+        the users most likely to buy them.
+      </p>
     </div>
+
     <div class="col-6of12">
-<h5 id="promote_your_apps_for_free">Promote your apps for free</h5>
-<p>Cross-sell your other apps (or your friend’s apps) to your existing users,
-using free AdMob <a href="https://support.google.com/admob/answer/3210452">house ads</a>.</p>
+      <h5 id="promote_your_apps_for_free">
+        Promote your apps for free
+      </h5>
+
+      <p>
+        Cross-sell your other apps (or your friend’s apps) to your existing
+        users, using free AdMob <a href=
+        "https://support.google.com/admob/answer/3210452">house ads</a>.
+      </p>
     </div>
   </div>
 </div>
 
-<h2 id="understand_users">Understand your users</h2>
+<h2 id="understand_users">
+  Understand your users
+</h2>
+
 <div class="wrap">
   <div class="cols" style="margin-top:2em;">
     <div class="col-6of12">
-<h5 id="analytics_for_apps">Analytics for apps</h5>
-<p>Analyze your app’s performance from within AdMob with Google Analytics.
-Discover where people are downloading your app, and the features they use the
-most in real time.</p>
+      <h5 id="analytics_for_apps">
+        Analytics for apps
+      </h5>
+
+      <p>
+        Analyze your app’s performance from within AdMob with Google Analytics.
+        Discover where people are downloading your app, and the features they
+        use the most in real time.
+      </p>
     </div>
+
     <div class="col-6of12">
-<h5 id="flow_visualization_reports">Flow visualization reports</h5>
-<p>In Analytics, see how people are navigating through your app with graphical
-<a href="https://support.google.com/analytics/answer/2519986">flow reports</a>.
-View the path they take to making a purchase, and the point where they exit
-the app, plus much more.</p>
+      <h5 id="flow_visualization_reports">
+        Flow visualization reports
+      </h5>
+
+      <p>
+        In Analytics, see how people are navigating through your app with
+        graphical <a href=
+        "https://support.google.com/analytics/answer/2519986">flow reports</a>.
+        View the path they take to making a purchase, and the point where they
+        exit the app, plus much more.
+      </p>
     </div>
   </div>
 </div>
 
-
-<div style="<h2 id=tips>Tips</h2>
+<h2 id="tips">
+  Tips
+</h2>
 
 <ul>
-  <li> Place ads wisely, they shouldn't be too intrusive but still need to be clearly
-visible to attract clickthroughs.
-  <li> Use banner, interstitial, and other ad formats appropriately.
-  <li> Make use of targeting features to match ads with your users and your app.
-  <li> Remember that ads form part of your app and must match its age rating.
-  <li> Exercise control options sensibly, don't get carried away excluding potentially
-competing ads at the expense of revenue.
+  <li>Place ads wisely, they shouldn't be too intrusive but still need to be
+  clearly visible to attract clickthroughs.
+  </li>
+
+  <li>Use banner, interstitial, and other ad formats appropriately.
+  </li>
+
+  <li>Make use of targeting features to match ads with your users and your app.
+  </li>
+
+  <li>Remember that ads form part of your app and must match its age rating.
+  </li>
+
+  <li>Exercise control options sensibly, don't get carried away excluding
+  potentially competing ads at the expense of revenue.
+  </li>
 </ul>
 
 
diff --git a/docs/html/distribute/monetize/ecommerce.jd b/docs/html/distribute/monetize/ecommerce.jd
index dc56d46..be1db64 100644
--- a/docs/html/distribute/monetize/ecommerce.jd
+++ b/docs/html/distribute/monetize/ecommerce.jd
@@ -1,22 +1,22 @@
 page.title=E-commerce
-page.image=/distribute/images/ecommerce.jpg
+page.image=/images/cards/card-ecommerce_16-9_2x.png
 page.metaImage=With Instant Buy you can sell physical goods and services from your web pages.
-page.tags="monetizing", "physical goods", "wallet"
+page.tags="monetizing", "physical goods", "payments"
 @jd:body
 
 <div class="figure">
   <img src="{@docRoot}images/gp-ecom-0.png" style="width:300px;">
   <p class="img-caption">
-    Product Purchase with Instant Buy
+    Product Purchase with Android Pay
   </p>
 </div>
 
 <p>
-  With Google Wallet Instant Buy, you've the added flexibility of selling
+  With Android Pay, you've the added flexibility of selling
   physical goods and services, such as clothing or movie tickets, through your
   apps using <a href=
-  "https://developers.google.com/wallet/instant-buy/">Instant Buy for
-  Android</a> <strong>(US Only)</strong>.
+  "https://developers.google.com/wallet/instant-buy/">the Android Pay API</a>
+  <strong>(US Only)</strong>.
 </p>
 
 <p>
@@ -28,14 +28,14 @@
 </p>
 
 <p>
-  Your customers purchase goods and services with any Google Wallet payment
-  method &mdash; credit card, gift card, or Wallet balance. Google Wallet
-  Instant Buy helps you minimize user data entry by enabling your payment flow
+  Your customers purchase goods and services with any payment
+  method &mdash; credit card, gift card, or Wallet balance. Android Pay
+  helps you minimize user data entry by enabling your payment flow
   to retrieve information directly from the user’s wallet.
 </p>
 
 <p>
-  You also keep your existing payment infrastructure and leverage Google Wallet
+  You also keep your existing payment infrastructure and leverage Android Pay
   to optimize your payment flow &mdash; users can make purchases in as a few as
   two clicks and the flow is simplified with features to retrieve information
   directly from the user’s wallet and intelligent auto-completion of addresses.
diff --git a/docs/html/distribute/monetize/freemium.jd b/docs/html/distribute/monetize/freemium.jd
index 0d33054..219b12d 100644
--- a/docs/html/distribute/monetize/freemium.jd
+++ b/docs/html/distribute/monetize/freemium.jd
@@ -1,5 +1,5 @@
 page.title=Monetize Freemium Apps
-page.image=/distribute/images/freemium.jpg
+page.image=images/cards/card-monetize-freemium_16-9_2x.png
 page.metaDescription=Use Google Play In-app Billing and other tools to monetize your free apps.
 page.tags="in-app", "billing", "iap", "monetizing"
 @jd:body
@@ -57,7 +57,7 @@
 </p>
 
 <p>
-  To get started with In-app Billing you need to set-up a Google Wallet
+  To get started with In-app Billing you need to set-up a Google payments
   <a href="{@docRoot}distribute/googleplay/start.html#merchant-account">Merchant
   Account</a> from Developer Console. You then define <a href=
   "{@docRoot}distribute/googleplay/developer-console.html#in-app-products">in-app
diff --git a/docs/html/distribute/monetize/payments.jd b/docs/html/distribute/monetize/payments.jd
index 187f872..7d972bb 100644
--- a/docs/html/distribute/monetize/payments.jd
+++ b/docs/html/distribute/monetize/payments.jd
@@ -1,12 +1,12 @@
 page.title=Convenient, Frictionless Purchasing
-page.image=
+page.image=images/cards/card-frictionless-purchasing_16-9_2x.png
 page.metaDescription=Users can purchase instantly with a choice of payment methods.
 page.tags="google play", "payments", "gift card"
 
 @jd:body
 
 <div class="figure">
-  <img src="{@docRoot}images/gp-start-wallet-icon.png" style="width:200px;">
+  <img src="{@docRoot}images/cards/card-frictionless-purchasing_16-9_2x.png">
 </div>
 
 <p>
@@ -41,7 +41,7 @@
 
 <p>
   Users can pay using any credit card that they’ve registered in Google Play.
-  Credit Cards added to Google Play are stored in the user’s Google Wallet and
+  Credit Cards added to Google Play are stored in the user’s Google wallet and
   available for in-app purchases and instant buys too. To make it easy for
   users to get started, registration is offered as a part of the initial device
   setup process.
diff --git a/docs/html/distribute/monetize/premium.jd b/docs/html/distribute/monetize/premium.jd
index c8823d1..2ba7eef 100644
--- a/docs/html/distribute/monetize/premium.jd
+++ b/docs/html/distribute/monetize/premium.jd
@@ -1,5 +1,5 @@
 page.title=Monetize Premium Apps
-page.image=/distribute/images/premium.jpg
+page.image=/images/cards/card-monetize-premium_16-9_2x.png
 page.metaDescription=Charging users to download your apps is a simple, convenient monetization model.
 page.tags="monetizing", "paid"
 
@@ -11,12 +11,13 @@
 <p>
   Charging users to download your apps is a simple, convenient monetization
   model. After creating your <a href=
-  "/distribute/googleplay/start.html#merchant-account">Merchant
-  Account</a>, you <a href=
-  "/distribute/googleplay/developer-console.html#selling-pricing-your-products">set prices for your
-  apps</a> in the Developer Console. You can optionally include advertising or use
-  <a href="{@docRoot}google/play/billing/index.html">In-app
-  Billing</a> to sell additional features or content.
+  "/distribute/googleplay/start.html#merchant-account">Merchant Account</a>,
+  you <a href=
+  "/distribute/googleplay/developer-console.html#selling-pricing-your-products">
+  set prices for your apps</a> in the Developer Console. You can optionally
+  include advertising or use <a href=
+  "{@docRoot}google/play/billing/index.html">In-app Billing</a> to sell
+  additional features or content.
 </p>
 
 <p>
diff --git a/docs/html/distribute/monetize/subscriptions.jd b/docs/html/distribute/monetize/subscriptions.jd
index 6a4d9b1..a17cd78 100644
--- a/docs/html/distribute/monetize/subscriptions.jd
+++ b/docs/html/distribute/monetize/subscriptions.jd
@@ -1,5 +1,5 @@
 page.title=Monetize with Subscriptions
-page.image=/distribute/images/subscription.jpg
+page.image=images/cards/card-monetize_subscriptions_16-9_2x.png
 page.metaDescription=Sell subscriptions to your products to create continuing revenue streams.
 page.tags="in-app", "iap", "monetizing", "free", "trials"
 @jd:body
@@ -21,8 +21,8 @@
 <p>
   When users purchase subscriptions in your apps, Google Play handles all
   checkout details so your apps never have to directly process any financial
-  transactions. Google Play processes all payments for subscriptions through
-  Google Wallet, just as it does for standard in-app products and app
+  transactions. Google Play processes all payments for subscriptions
+  just as it does for standard in-app products and app
   purchases. This ensures a consistent and familiar purchase flow for your
   users and reduces cart abandonment rates.
 </p>
@@ -43,7 +43,7 @@
 </p>
 
 <p>
-  To get started with subscriptions you need to set-up a Google Wallet <a href=
+  To get started with subscriptions you need to set-up a Google payments <a href=
   "{@docRoot}distribute/googleplay/start.html#merchant-account">Merchant
   Account</a> from the Developer Console. You then define subscriptions for
   published or draft apps in the <a href=
diff --git a/docs/html/distribute/tools/launch-checklist.jd b/docs/html/distribute/tools/launch-checklist.jd
index f310800..57a1616 100644
--- a/docs/html/distribute/tools/launch-checklist.jd
+++ b/docs/html/distribute/tools/launch-checklist.jd
@@ -431,9 +431,9 @@
 
 <p>
   If your app is be priced, or if you'll be selling in-app products, you need
-  <a href=
-  "https://developers.google.com/wallet/digital/training/getting-started/merchant-setup">
-  set up a Google Wallet Merchant Account</a> before you can publish.
+  to <a href=
+  "{@docRoot}distribute/googleplay/start.html">
+  set up a Google payments merchant account</a> before you can publish.
 </p>
 
 <h3 class="rel-resources clearfloat">Related resources</h3>
@@ -855,7 +855,7 @@
   <li>
     <p>
       Your developer profile has the correct information and is linked to the
-      proper Google Wallet merchant account (if you’re selling products).
+      proper Google payments merchant account (if you’re selling products).
     </p>
   </li>
 
diff --git a/docs/html/distribute/users/build-buzz.jd b/docs/html/distribute/users/build-buzz.jd
index bfdc095..7bc6f6c 100644
--- a/docs/html/distribute/users/build-buzz.jd
+++ b/docs/html/distribute/users/build-buzz.jd
@@ -5,49 +5,8 @@
 
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
-    <h2>
-      Contents
-    </h2>
-
-    <ol>
-      <li>
-        <a href="#link-to-your-apps">Link to Your Apps</a>
-      </li>
-      <li>
-        <a href="#use-the-google-play-badge">Use the Badge</a>
-      </li>
-      <li>
-        <a href="#cross-promote-from-your-other-apps">Cross-Promote Your Apps</a>
-      </li>
-      <li>
-        <a href="#hold-a-contest">Hold a Contest</a>
-      </li>
-      <li>
-        <a href="#leverage-pr">Leverage PR</a>
-      </li>
-      <li>
-        <a href="#use-social-media">Use Social Media</a>
-      </li>
-      <li>
-        <a href="#publish-youtube-videos">Publish YouTube Videos</a>
-      </li>
-      <li>
-        <a href="#advertise">Advertise</a>
-      </li>
-      <li>
-        <a href="#maximize-your-marketing-spend">Maximize Your Marketing
-        spend</a>
-      </li>
-      <li><a href="#related-resources">Related Resources</a></li>
-    </ol>
-  </div>
-</div>
-
-<div style="float:right;border 2px solid #ddd;">
-  <img src="{@docRoot}distribute/images/build-buzz.jpg" style=
-  "width:240px;margin:0 0 1.5em 1em;">
+<div class="figure">
+  <img src="{@docRoot}distribute/images/build-buzz.jpg">
 </div>
 
 <p>
@@ -64,7 +23,7 @@
   dividends.
 </p>
 
-<div class="headerLine">
+
   <h2 id="link-to-your-apps">
     Link to Your Apps in Google Play
   </h2>
@@ -101,7 +60,6 @@
   </li>
 </ul>
 
-<div class="headerLine">
   <h2 id="use-the-google-play-badge">
     Use the Google Play Badge
   </h2>
diff --git a/docs/html/distribute/users/build-community.jd b/docs/html/distribute/users/build-community.jd
index 5cdabea..23b9d88 100644
--- a/docs/html/distribute/users/build-community.jd
+++ b/docs/html/distribute/users/build-community.jd
@@ -1,33 +1,10 @@
 page.title=Build Community
 page.metaDescription=Build a loyal following with great support and communication.
 page.tags="users, growth, community"
+page.image=/images/cards/card-build-community_16-9_2x.png
 
 @jd:body
 
-<div id="qv-wrapper">
-  <div id="qv">
-  <h2>
-    Contents
-  </h2>
-
-  <ol>
-    <li>
-    <a href="#starting-your-community">Starting Your Community</a>
-    </li>
-
-    <li>
-    <a href="#tools-to-build-your-community">Tools to Build Your Community</a>
-    </li>
-
-    <li>
-    <a href="#managing-your-community">Managing Your Community</a>
-    </li>
-    <li>
-    <a href="#related-resources">Related Resources</a>
-    </li>
-  </ol>
-  </div>
-</div>
 
 <p>
   Fans of your apps love to help others, turn newer users into fans, and bring
@@ -36,6 +13,10 @@
   to others.
 </p>
 
+<div class="figure">
+  <img src="{@docRoot}images/cards/card-build-community_16-9_2x.png">
+</div>
+
 <p>
   Building your own community can help you bring content that will delight
   users and get them talking about your apps to friends, family and others in
diff --git a/docs/html/distribute/users/promote-with-ads.jd b/docs/html/distribute/users/promote-with-ads.jd
index 3456c66..f0e3256 100644
--- a/docs/html/distribute/users/promote-with-ads.jd
+++ b/docs/html/distribute/users/promote-with-ads.jd
@@ -21,28 +21,40 @@
 <p><a href="https://support.google.com/adwords/answer/6032059">Get started with AdWords
 app install ads</a>.</p>
 
-
-
 <div class="wrap">
   <div class="cols" style="margin-top:1em;">
     <div class="col-4of12">
-   <h3>From Google Play</h3>
-    <img src="/images/distribute/promote_ads_play.png">
-    <p class="figure-caption">Search ads on Google Play are still undergoing testing and
-    not yet available to buy. <a
-    href="http://android-developers.blogspot.com/2015/02/a-new-way-to-promote-your-app-on-google.html">Find
-    out more</a>.</p>
+      <h3>
+        From Google Play
+      </h3>
+      <img src="/images/distribute/promote_ads_play.png">
+      <p class="figure-caption">
+        Search ads on Google Play are still undergoing testing and not yet
+        available to buy. <a href=
+        "http://android-developers.blogspot.com/2015/02/a-new-way-to-promote-your-app-on-google.html">
+        Find out more</a>.
+      </p>
     </div>
+
     <div class="col-4of12">
-  <h3>From search</h3>
-    <img src="/images/distribute/promote_ads_search.png">
-    <p class="figure-caption">Connect with users as they search for content and services
-    provided by your app.</p>
+      <h3>
+        From search
+      </h3>
+      <img src="/images/distribute/promote_ads_search.png">
+      <p class="figure-caption">
+        Connect with users as they search for content and services provided by
+        your app.
+      </p>
     </div>
+
     <div class="col-4of12">
-   <h3>From YouTube</h3>
-   <img src="/images/distribute/promote_ads_youtube.png">
-    <p class="figure-caption">Promote your app when users are watching related videos.</p>
+      <h3>
+        From YouTube
+      </h3>
+      <img src="/images/distribute/promote_ads_youtube.png">
+      <p class="figure-caption">
+        Promote your app when users are watching related videos.
+      </p>
     </div>
   </div>
 </div>
@@ -50,88 +62,144 @@
 <div class="wrap">
   <div class="cols" style="margin-top:1em;">
     <div class="col-4of12">
-    <h3>From apps</h3>
-    <img src="/images/distribute/promote_ads_apps.png">
-    <p class="figure-caption">Reach users while they’re engaged with apps and games across the
-    AdMob network.</p>
+      <h3>
+        From apps
+      </h3>
+      <img src="/images/distribute/promote_ads_apps.png">
+      <p class="figure-caption">
+        Reach users while they’re engaged with apps and games across the AdMob
+        network.
+      </p>
     </div>
+
     <div class="col-4of12">
-   <h3>From the web</h3>
-   <img src="/images/distribute/promote_ads_web.png">
-    <p class="figure-caption">Reach users while they’re engaged with websites across the Google
-    Display Network.</p>
+      <h3>
+        From the web
+      </h3>
+      <img src="/images/distribute/promote_ads_web.png">
+      <p class="figure-caption">
+        Reach users while they’re engaged with websites across the Google
+        Display Network.
+      </p>
     </div>
+
     <div class="col-4of12">
-    <h3>From Gmail</h3>
-    <img src="/images/distribute/promote_ads_gmail.png">
-    <p class="figure-caption">Promote your app while users communicate and get things done in
-    Gmail.</p>
+      <h3>
+        From Gmail
+      </h3>
+      <img src="/images/distribute/promote_ads_gmail.png">
+      <p class="figure-caption">
+        Promote your app while users communicate and get things done in Gmail.
+      </p>
     </div>
   </div>
 </div>
 
-
-<h2>Tips</h3>
+<h2>
+  Tips
+</h2>
 
 <ul>
-  <li> Estimate how much an app user is worth to your business, so that you can work
-out an appropriate cost-per-install that you’re willing to pay.
-  <li> Ensure that your ads and Play Store listing are compelling and clearly describe
-your app’s value.
-  <li> Check that you’re accurately tracking and attributing installs by installing
-the AdWords <a href="https://developers.google.com/app-conversion-tracking/">conversion tracking SDK</a>.
-  <li> Promote your app broadly across display, search, and video to reach even more
-potential users and drive a higher volume of installs.
-  <li> Start with broader targeting and then fine tune your bidding once you’ve
-assessed your campaign results.
-  <li> Use Conversion Optimizer to automate your bidding so that your ads target users
-who are most likely to install your app. 
-  <li> Use Conversion Optimizer for in-app buyers to automate your bidding so that
-your ads target high value users who are most likely to make purchases in your
-app.
+  <li>Estimate how much an app user is worth to your business, so that you can
+  work out an appropriate cost-per-install that you’re willing to pay.
+  </li>
+
+  <li>Ensure that your ads and Play Store listing are compelling and clearly
+  describe your app’s value.
+  </li>
+
+  <li>Check that you’re accurately tracking and attributing installs by
+  installing the AdWords <a href=
+  "https://developers.google.com/app-conversion-tracking/">conversion tracking
+  SDK</a>.
+  </li>
+
+  <li>Promote your app broadly across display, search, and video to reach even
+  more potential users and drive a higher volume of installs.
+  </li>
+
+  <li>Start with broader targeting and then fine tune your bidding once you’ve
+  assessed your campaign results.
+  </li>
+
+  <li>Use Conversion Optimizer to automate your bidding so that your ads target
+  users who are most likely to install your app.
+  </li>
+
+  <li>Use Conversion Optimizer for in-app buyers to automate your bidding so
+  that your ads target high value users who are most likely to make purchases
+  in your app.
+  </li>
 </ul>
 
+<h2 id="engage_with_users">
+  Engage with users
+</h2>
 
-<h2 id=engage_with_users>Engage with users</h2>
-
-<p>Getting a user to install an app is one thing, but you'll also want them to
-open it regularly. AdWords offers app re-engagement tools to help your app stay
-in mind with users who’ve already installed it on their phone. AdWords can
-remind them of key features and encourage them to try your app again, or help
-them complete an activity they didn't know your app could handle.</p>
-
+<p>
+  Getting a user to install an app is one thing, but you'll also want them to
+  open it regularly. AdWords offers app re-engagement tools to help your app
+  stay in mind with users who’ve already installed it on their phone. AdWords
+  can remind them of key features and encourage them to try your app again, or
+  help them complete an activity they didn't know your app could handle.
+</p>
 
 <div class="wrap">
   <div class="cols" style="margin-top:1em;">
     <div class="col-4of12">
-   <h3>From search</h3>
-   <img src="/images/distribute/promote_ads.png">
-    <p class="figure-caption">Add deep links to your app, then bring users straight
-    to relevant app content when they’re searching.</p>
+      <h3>
+        From search
+      </h3>
+      <img src="/images/distribute/promote_ads.png">
+      <p class="figure-caption">
+        Add deep links to your app, then bring users straight to relevant app
+        content when they’re searching.
+      </p>
     </div>
+
     <div class="col-4of12">
-    <h3>From apps</h3>
-    <img src="/images/distribute/promote_ads_inapp.png">
-    <p class="figure-caption">Use remarketing and deep links to bring users to just the right
-    place in your app to re-engage and convert, from other apps and games they love.</p>
+      <h3>
+        From apps
+      </h3>
+      <img src="/images/distribute/promote_ads_inapp.png">
+      <p class="figure-caption">
+        Use remarketing and deep links to bring users to just the right place
+        in your app to re-engage and convert, from other apps and games they
+        love.
+      </p>
     </div>
   </div>
 </div>
 
-
-<h3>Tips</h3>
+<h3>
+  Tips
+</h3>
 
 <ul>
-  <li> Track what users do in your app after they’ve clicked an ad, by installing the
-AdWords <a href="https://developers.google.com/app-conversion-tracking/">conversion tracking SDK</a>.
-  <li> Advertise a compelling reason for users to re-engage with your app (such as a
-reminder or a special offer).
-  <li> <a href="https://developers.google.com/app-indexing/webmasters/app">Add deep links</a> to your app that’ll take users  directly to the parts of your app that will be
-most relevant and interesting to them, where they can easily take action.
-  <li> Re-engage your app users across the display network with remarketing lists and
-search with keywords.
-  <li> Use remarketing lists to target high value users so that you can drive more
-conversions in your app.
+  <li>Track what users do in your app after they’ve clicked an ad, by
+  installing the AdWords <a href=
+  "https://developers.google.com/app-conversion-tracking/">conversion tracking
+  SDK</a>.
+  </li>
+
+  <li>Advertise a compelling reason for users to re-engage with your app (such
+  as a reminder or a special offer).
+  </li>
+
+  <li>
+    <a href="https://developers.google.com/app-indexing/webmasters/app">Add
+    deep links</a> to your app that’ll take users directly to the parts of your
+    app that will be most relevant and interesting to them, where they can
+    easily take action.
+  </li>
+
+  <li>Re-engage your app users across the display network with remarketing
+  lists and search with keywords.
+  </li>
+
+  <li>Use remarketing lists to target high value users so that you can drive
+  more conversions in your app.
+  </li>
 </ul>
 
 <h2 id="related-resources">Related Resources</h2>
diff --git a/docs/html/distribute/users/youtube.jd b/docs/html/distribute/users/youtube.jd
index 0be6584..9554d8c 100644
--- a/docs/html/distribute/users/youtube.jd
+++ b/docs/html/distribute/users/youtube.jd
@@ -1,28 +1,54 @@
 page.title=Drive installs from YouTube
 page.metaDescription=Bring users from videos to your store listing with a merchandise card available on YouTube.
-page.image=images/cards/card-youtube_2x.png
+page.image=images/cards/card-instals-from-youtube_16-9_2x.png
 page.tags="users, youtube, cards, videos"
 @jd:body
 
-<p>Now you can bring users who discover your app videos on YouTube to your store listing with a merchandise card, one of several card types available to add to YouTube videos. Once published the presence of the merchandise card is indicated in the video with an information icon. When a viewer opens the card they follow the link to your app on the Play Store, where they can install your app.</p>
+<p>
+  Now you can bring users who discover your app videos on YouTube to your store
+  listing with a merchandise card, one of several card types available to add
+  to YouTube videos. Once published the presence of the merchandise card is
+  indicated in the video with an information icon. When a viewer opens the card
+  they follow the link to your app on the Play Store, where they can install
+  your app.
+</p>
 
 <div class="wrap" style="margin:2em auto">
   <div class="cols">
-    <div class="col-9of12">
-      <img src="{@docRoot}images/distribute/youtube-card-example.png">
-    </div>
+	<div class="col-9of12">
+	  <img src="{@docRoot}images/distribute/youtube-card-example.png">
+	</div>
   </div>
 </div>
 
-<p>Get started <a href="https://support.google.com/youtube/answer/6140493">adding merchandise cards to your uploaded videos</a>.</p>
+<p>
+  Get started <a href=
+  "https://support.google.com/youtube/answer/6140493">adding merchandise cards
+  to your uploaded videos</a>.
+</p>
 
-<h2>Tips</h2>
+<h2>
+  Tips
+</h2>
+
 <ul>
-<li>Don’t indicate the location of a card within your video, cards might be positioned differently on different devices.</li>
-<li>When you add cards, featured video or playlist highlights in your video are hidden. </li>
-<li>In order to display cards, your account needs to be in good standing.</li>
-<li>Performance reporting for cards is available in YouTube Analytics.</li>
-<li>Cards work better when they're not too close to each other. Try spacing them out.</li>
+  <li>Don’t indicate the location of a card within your video, cards might be
+  positioned differently on different devices.
+  </li>
+
+  <li>When you add cards, featured video or playlist highlights in your video
+  are hidden.
+  </li>
+
+  <li>In order to display cards, your account needs to be in good standing.
+  </li>
+
+  <li>Performance reporting for cards is available in YouTube Analytics.
+  </li>
+
+  <li>Cards work better when they're not too close to each other. Try spacing
+  them out.
+  </li>
 </ul>
 
 <h2 id="related-resources">Related resources</h2>
diff --git a/docs/html/google/play/billing/billing_admin.jd b/docs/html/google/play/billing/billing_admin.jd
index 5904b03..009495b 100644
--- a/docs/html/google/play/billing/billing_admin.jd
+++ b/docs/html/google/play/billing/billing_admin.jd
@@ -29,14 +29,14 @@
 Developer Console, registering test accounts, and handling refunds when necessary.</p>
 
 <p>You must have a Google Play publisher account to register test accounts. And you must have a
-Google Wallet merchant account to create a product list and issue refunds to your users. If you
+Google payments merchant account to create a product list and issue refunds to your users. If you
 already have a publisher account on Google Play, you can use your existing account. You do not
 need to register for a new account to support in-app billing.</p>
 
 <p>If you do not have a publisher account, you can register as a Google Play
 developer and set up a publisher account at the <a
 href="http://play.google.com/apps/publish">Google Play Developer Console</a>. If you do not
-have a Google Wallet merchant account, you can register for one through the
+have a Google payments merchant account, you can register for one through the
 Developer Console.</p>
 
 <h2 id="billing-list-setup">Creating a Product List</h2>
@@ -48,7 +48,7 @@
 
 <p>You can access an application's product list by clicking the <strong>In-App Products</strong>
 link in applications listed in your developer account (see
-figure 1). The <strong>In-App Products</strong> link appears only if you have a Google Wallet
+figure 1). The <strong>In-App Products</strong> link appears only if you have a Google payments
 merchant account and the application's manifest includes the <code>com.android.vending.BILLING</code>
 permission.</p>
 
@@ -68,7 +68,7 @@
 
 <p>You can create a product list for any published application, or any
 application in the alpha or beta channels, that's been
-uploaded and saved to the Developer Console. However, you must have a Google Wallet merchant
+uploaded and saved to the Developer Console. However, you must have a Google payments merchant
 account and the application's manifest must include the <code>com.android.vending.BILLING</code>
 permission. If an application's manifest does not include this permission, you will be able to edit
 existing items in the product list but you will not be able to add new items to the list. For more
@@ -408,22 +408,22 @@
 
 <p>In-app billing does not allow users to send a refund request to Google Play. Refunds for
 in-app purchases must be directed to you (the application developer). You can then process the
-refund through your Google Wallet merchant account. When you do this, Google Play receives a
-refund notification from Google Wallet, and Google Play sends a refund message to your
+refund through your Google payments merchant account. When you do this, Google Play receives a
+refund notification from Google payments, and Google Play sends a refund message to your
 application. For more information, see <a
 href="{@docRoot}google/play/billing/v2/api.html#billing-action-notify">Handling
 IN_APP_NOTIFY messages</a> and <a
 href="http://support.google.com/googleplay/android-developer/bin/answer.py?hl=en&answer=1153485">In-app Billing
 Pricing</a>.</p>
 
-<p class="caution"><strong>Important:</strong> You cannot use the Google Wallet API to issue
+<p class="caution"><strong>Important:</strong> You cannot use the API to issue
 refunds or cancel In-app Billing transactions. You must do this manually through your Google
-Wallet merchant account. However, you can use the Google Wallet API to retrieve order
+payments merchant account. However, you can use the API to retrieve order
 information.</p>
 
 <h2 id="orderId">Working with Order Numbers</h2>
 
-<p>When a user purchases an in-app item, Google Wallet assigns the transaction
+<p>When a user purchases an in-app item, Google assigns the transaction
 a unique and permanent order number. Google Play provides that order number to
 you at the conclusion of the purchase flow, as the value of the
 <code>orderId</code> field of the <code>PURCHASE_STATE_CHANGED</code>
@@ -435,9 +435,9 @@
 customer support.</p>
 
 <p>The order number itself is a string consisting of numbers only, with a format
-assigned and managed by Google Wallet.</p>
+assigned and managed by Google.</p>
 
-<p>For transactions dated 5 December 2012 or later, Google Wallet assigns a
+<p>For transactions dated 5 December 2012 or later, Google payments assigns a
 Merchant Order Number (rather than a Google Order Number) and reports the Merchant
 Order Number as the value of <code>orderID</code>. Here's an
 example:</p>
diff --git a/docs/html/google/play/billing/billing_overview.jd b/docs/html/google/play/billing/billing_overview.jd
index 1c20d78..e984d51 100644
--- a/docs/html/google/play/billing/billing_overview.jd
+++ b/docs/html/google/play/billing/billing_overview.jd
@@ -10,7 +10,7 @@
     <li>Use In-app Billing to sell digital goods, including one-time items and
 recurring subscriptions.</li>
     <li>Supported for any app published on Google Play. You only need a Google
-Play Developer Console account and a Google Wallet merchant account.</li>
+Play Developer Console account and a Google payments merchant account.</li>
     <li>Checkout processing is automatically handled by Google Play, with the
 same look-and-feel as for app purchases.</li>
   </ul>
@@ -129,7 +129,7 @@
 <h2 id="checkout">Google Play Purchase Flow</h2>
 <p>Google Play uses the same checkout backend service as is used for application
 purchases, so your users experience a consistent and familiar purchase flow.</p>
-<p class="note"><strong>Important:</strong> You must have a Google Wallet
+<p class="note"><strong>Important:</strong> You must have a Google payments
 merchant account to use the In-app Billing service on Google Play.</p>
 <p>To initiate a purchase, your application sends a billing request for a
 specific in-app product. Google Play then handles all of the checkout details for
diff --git a/docs/html/google/play/billing/billing_subscriptions.jd b/docs/html/google/play/billing/billing_subscriptions.jd
index e412a9d..05ab185 100644
--- a/docs/html/google/play/billing/billing_subscriptions.jd
+++ b/docs/html/google/play/billing/billing_subscriptions.jd
@@ -72,7 +72,7 @@
 <p>When users purchase subscriptions in your apps, Google Play handles all
 checkout details so your apps never have to directly process any financial
 transactions. Google Play processes all payments for subscriptions through
-Google Wallet, just as it does for standard in-app products and app purchases.
+Google payments, just as it does for standard in-app products and app purchases.
 This ensures a consistent and familiar purchase flow for your users.</p>
 
 <img src="{@docRoot}images/in-app-billing/v3/billing_subscription_v3.png" style="float:right; border:4px solid ddd;">
@@ -162,15 +162,15 @@
 automated recurring billing at your choice of intervals:</p>
 
 <ul>
-  <li>Weekly &mdash; Google Play bills the customer’s Google Wallet account at
+  <li>Weekly &mdash; Google Play bills the customer’s Google payments account at
   the time of purchase and every week after the original purchase date.</li>
-  <li>Monthly &mdash; Google Play bills the customer’s Google Wallet account at
+  <li>Monthly &mdash; Google Play bills the customer’s Google payments account at
   the time of purchase and monthly subsequent to the purchase date (exact billing
   intervals can vary slightly over time).</li>
-  <li>Annually &mdash; Google Play bills the customer's Google Wallet account at
+  <li>Annually &mdash; Google Play bills the customer's Google payments account at
   the time of purchase and again on the same date in subsequent years.</li>
 
-  <li>Seasonal &mdash; Google Play bills the customer's Google Wallet account at
+  <li>Seasonal &mdash; Google Play bills the customer's Google payments account at
   the beginning of each "season" (you specify the season beginning and end
   dates). This
   is intended for annual purchases of seasonal content (such as sports-related
@@ -434,7 +434,7 @@
 <h2 id="payment">Payment Processing and Policies</h2>
 
 <p>In general, the terms of Google Play allow you to sell in-app subscriptions
-only through the standard payment processor, Google Wallet. For purchases of
+only through the standard payment processor, Google payments. For purchases of
 any subscription products, the transaction fee is the same as the transaction
 fee for application purchases (30%).</p>
 
@@ -449,7 +449,7 @@
 <h3 id="orderId">Subscription order numbers</h3>
 
 <p>To help you track transactions relating to a given subscription, Google
-Wallet provides a base Merchant Order Number for all recurrences of the
+payments provides a base Merchant Order Number for all recurrences of the
 subscription and denotes
 each recurring transaction by appending an integer as follows: </p>
 
diff --git a/docs/html/google/play/billing/billing_testing.jd b/docs/html/google/play/billing/billing_testing.jd
index 44b3286..f0eb254 100644
--- a/docs/html/google/play/billing/billing_testing.jd
+++ b/docs/html/google/play/billing/billing_testing.jd
@@ -128,8 +128,8 @@
 <ul>
 <li>Wait for the transactions to expire&mdash;Google Play clears completed test
 purchases 14 days after their purchase date. </li>
-<li>Cancel purchases manually&mdash;you can go to the Google Wallet Merchant
-Center, look up the transaction, and then cancel it. You can find transactions
+<li>Cancel purchases manually&mdash;you can go to the Google payments merchant
+center, look up the transaction, and then cancel it. You can find transactions
 by looking up their order numbers.</li>
 </ul>
 
@@ -162,7 +162,7 @@
 
 <img src="{@docRoot}images/billing_test_flow.png" height="381" id="figure1" />
 <p class="img-caption">
-  <strong>Figure 1.</strong>Wallet flow for the special reserved item android.test.purchased.
+  <strong>Figure 1.</strong>Purchase flow for the special reserved item android.test.purchased.
 </p>
 
 <p>You do not need to list the reserved products in your application's product list. Google Play
@@ -197,8 +197,8 @@
     <p>When you make an In-app Billing request with this product ID, Google Play responds as
     though the purchase was refunded. Refunds cannot be initiated through Google Play's in-app
     billing service. Refunds must be initiated by you (the merchant). After you process a refund
-    request through your Google Wallet merchant account, a refund message is sent to your application by
-    Google Play. This occurs only when Google Play gets notification from Google Wallet that
+    request through your Google payments merchant account, a refund message is sent to your application by
+    Google Play. This occurs only when Google Play gets notification from Google payments that
     a refund has been made. For more information about refunds, see <a href="{@docRoot}google/play/billing/v2/api.html#billing-action-notify">Handling
 IN_APP_NOTIFY messages</a> and <a href="http://support.google.com/googleplay/android-developer/bin/answer.py?hl=en&answer=1153485">In-app Billing
 Pricing</a>.</p>
@@ -267,7 +267,7 @@
 
 <p>To test your In-app Billing implementation with actual in-app purchases, you will need to
 register at least one test account on the Google Play Developer Console. You cannot use your
-developer account to test the complete in-app purchase process because Google Wallet does not let
+developer account to test the complete in-app purchase process because Google payments does not let
 you buy items from yourself. If you have not set up test accounts before, see <a
 href="{@docRoot}google/play/billing/billing_admin.html#billing-testing-setup">Setting up test
 accounts</a>.</p>
diff --git a/docs/html/google/play/billing/v2/api.jd b/docs/html/google/play/billing/v2/api.jd
index 36a9017..31dfdc9 100644
--- a/docs/html/google/play/billing/v2/api.jd
+++ b/docs/html/google/play/billing/v2/api.jd
@@ -463,7 +463,7 @@
 set to "managed per user account."</p>
 
 <p>In the second case, your application can receive an <code>IN_APP_NOTIFY</code> broadcast intent
-when Google Play receives a refund notification from Google Wallet. In this case, Google
+when Google Play receives a refund notification from Google. In this case, Google
 Play sends an <code>IN_APP_NOTIFY</code> message to your application. Your application can handle
 this message the same way it handles responses from an application-initiated
 <code>REQUEST_PURCHASE</code> message so that ultimately your application receives a
@@ -472,9 +472,9 @@
 <code>PURCHASE_STATE_CHANGED</code> broadcast intent. Also, the <code>purchaseState</code> field in
 the JSON string is set to 2.</p>
 
-<p class="caution"><strong>Important:</strong> You cannot use the Google Wallet API to
+<p class="caution"><strong>Important:</strong> You cannot use the API to
 issue refunds or cancel in-app billing transactions. You must do this manually through your
-Google Wallet merchant account. However, you can use the Google Wallet API to retrieve order
+Google payments merchant account. However, you can use the API to retrieve order
 information.</p>
 
 <h2 id="billing-security">Security Controls</h2>
@@ -512,7 +512,7 @@
 <ul>
   <li>In-app billing can be implemented only in applications that you publish through Google
   Play.</li>
-  <li>You must have a Google Wallet Merchant account to use Google Play In-app Billing.</li>
+  <li>You must have a Google payments Merchant account to use Google Play In-app Billing.</li>
   <li>To support subscriptions, version 3.5 or higher of the Google Play app is required. </li>
   <li>In-app Billing requires Android 1.6 (API level 4) or higher.</li>
   <li>You can use in-app billing to sell only digital content. You cannot use in-app billing to sell
diff --git a/docs/html/google/play/billing/v2/billing_integrate.jd b/docs/html/google/play/billing/v2/billing_integrate.jd
index c264271..1345c19 100644
--- a/docs/html/google/play/billing/v2/billing_integrate.jd
+++ b/docs/html/google/play/billing/v2/billing_integrate.jd
@@ -255,7 +255,7 @@
     List</a>.</p>
     <p class="note"><strong>Note:</strong> You must publish the items in your product
     list (<code>sword_001</code> and <code>potion_001</code>) even though you are not publishing the
-    sample application. Also, you must have a Google Wallet merchant account to add items to the
+    sample application. Also, you must have a Google payments merchant account to add items to the
     sample application's product list.</p>
   </li>
 </ol>
@@ -268,7 +268,7 @@
 <ol>
   <li><strong>Make sure you have at least one test account registered under your Google Play
   publisher account.</strong>
-    <p>You cannot purchase items from yourself (Google Wallet prohibits this), so you need to
+    <p>You cannot purchase items from yourself, so you need to
     create at least one test account that you can use to purchase items in the sample application.
     To learn how to set up a test account, see <a
     href="{@docRoot}google/play/billing/billing_testing.html#billing-testing-setup">Setting up Test
@@ -307,7 +307,7 @@
   </li>
   <li><strong>Run the application and purchase the sword or the potion.</strong>
     <p>When you use a test account to purchase items, the test account is billed through Google
-    Wallet and your Google Wallet merchant account receives a payout for the purchase.
+    payments and your Google payments merchant account receives a payout for the purchase.
     Therefore, you may want to refund purchases that are made with test accounts, otherwise the
     purchases will show up as actual payouts to your merchant account.</p>
 </ol>
diff --git a/docs/html/google/play/billing/v2/billing_reference.jd b/docs/html/google/play/billing/v2/billing_reference.jd
index 32e00cf..5d97c98 100644
--- a/docs/html/google/play/billing/v2/billing_reference.jd
+++ b/docs/html/google/play/billing/v2/billing_reference.jd
@@ -103,7 +103,7 @@
   <td><code>RESULT_ERROR</code></td>
   <td>6</td>
   <td>Indicates an unexpected server error. For example, this error is triggered if you try to
-purchase an item from yourself, which is not allowed by Google Wallet.</td>
+purchase an item from yourself, which is not allowed.</td>
 </tr>
 </table>
 </p>
@@ -392,7 +392,7 @@
 </tr>
 <tr>
   <td>orderId</td>
-  <td>A unique order identifier for the transaction. This corresponds to the Google Wallet Order
+  <td>A unique order identifier for the transaction. This corresponds to the Google payments order
   ID.</td>
 </tr>
 <tr>
diff --git a/docs/html/google/play/billing/v2/billing_subscriptions.jd b/docs/html/google/play/billing/v2/billing_subscriptions.jd
index 01e39ac..d602b0a 100644
--- a/docs/html/google/play/billing/v2/billing_subscriptions.jd
+++ b/docs/html/google/play/billing/v2/billing_subscriptions.jd
@@ -86,7 +86,7 @@
 token, a string value that uniquely identifies (and associates) a user ID and a
 subscription ID. Google Play generates the purchase token when the user
 completes the purchase of a subscription product (and payment is approved by
-Google Wallet) and then sends it to the purchasing app on the device through the
+Google) and then sends it to the purchasing app on the device through the
 In-app Billing API. </p>
 
 <p>At the conclusion of a <code>PURCHASE_REQUEST</code> message flow, your app
diff --git a/docs/html/images/cards/card-build-community_16-9_2x.png b/docs/html/images/cards/card-build-community_16-9_2x.png
new file mode 100644
index 0000000..be4c910
--- /dev/null
+++ b/docs/html/images/cards/card-build-community_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-ecommerce_16-9_2x.png b/docs/html/images/cards/card-ecommerce_16-9_2x.png
new file mode 100644
index 0000000..5ebb85e
--- /dev/null
+++ b/docs/html/images/cards/card-ecommerce_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-frictionless-purchasing_16-9_2x.png b/docs/html/images/cards/card-frictionless-purchasing_16-9_2x.png
new file mode 100644
index 0000000..8358a18
--- /dev/null
+++ b/docs/html/images/cards/card-frictionless-purchasing_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-google-cloud-messaging_16-9_2x.png b/docs/html/images/cards/card-google-cloud-messaging_16-9_2x.png
new file mode 100644
index 0000000..6bdf13c
--- /dev/null
+++ b/docs/html/images/cards/card-google-cloud-messaging_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-instals-from-youtube_16-9_2x.png b/docs/html/images/cards/card-instals-from-youtube_16-9_2x.png
new file mode 100644
index 0000000..88e2f36
--- /dev/null
+++ b/docs/html/images/cards/card-instals-from-youtube_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-monetize-freemium_16-9_2x.png b/docs/html/images/cards/card-monetize-freemium_16-9_2x.png
new file mode 100644
index 0000000..5761e90
--- /dev/null
+++ b/docs/html/images/cards/card-monetize-freemium_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-monetize-premium_16-9_2x.png b/docs/html/images/cards/card-monetize-premium_16-9_2x.png
new file mode 100644
index 0000000..609164a
--- /dev/null
+++ b/docs/html/images/cards/card-monetize-premium_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/cards/card-monetize_subscriptions_16-9_2x.png b/docs/html/images/cards/card-monetize_subscriptions_16-9_2x.png
new file mode 100644
index 0000000..c2f77f2
--- /dev/null
+++ b/docs/html/images/cards/card-monetize_subscriptions_16-9_2x.png
Binary files differ
diff --git a/docs/html/images/distribute/android-work.jpg b/docs/html/images/distribute/android-work.jpg
deleted file mode 100644
index 91f742b..0000000
--- a/docs/html/images/distribute/android-work.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/distribute/dff-badging.png b/docs/html/images/distribute/dff-badging.png
new file mode 100644
index 0000000..9fac434
--- /dev/null
+++ b/docs/html/images/distribute/dff-badging.png
Binary files differ
diff --git a/docs/html/images/distribute/dff-browse.png b/docs/html/images/distribute/dff-browse.png
new file mode 100644
index 0000000..ae84ee0
--- /dev/null
+++ b/docs/html/images/distribute/dff-browse.png
Binary files differ
diff --git a/docs/html/images/distribute/dff-character.png b/docs/html/images/distribute/dff-character.png
new file mode 100644
index 0000000..922367a
--- /dev/null
+++ b/docs/html/images/distribute/dff-character.png
Binary files differ
diff --git a/docs/html/images/distribute/engage-intents.png b/docs/html/images/distribute/engage-intents.png
index 2889c08..0d1ad03 100644
--- a/docs/html/images/distribute/engage-intents.png
+++ b/docs/html/images/distribute/engage-intents.png
Binary files differ
diff --git a/docs/html/images/distribute/gpfw.jpg b/docs/html/images/distribute/gpfw.jpg
new file mode 100644
index 0000000..ad934fd
--- /dev/null
+++ b/docs/html/images/distribute/gpfw.jpg
Binary files differ
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index 050bf10..05f89ff 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -173,7 +173,7 @@
     "resources": [
       "http://www.youtube.com/watch?v=Pd49vTkvu0U",
       "http://www.youtube.com/watch?v=ekxABqJeRBc",
-      "http://www.youtube.com/watch?v=MPnH7h12h0U",
+     "http://www.youtube.com/watch?v=MPnH7h12h0U",
       "http://www.youtube.com/watch?v=700gYRkhkLM"
     ]
   },
@@ -345,7 +345,7 @@
       "distribute/engage/deep-linking.html",
       "distribute/engage/ads.html",
       "distribute/engage/intents.html",
-      "distribute/engage/appindexing.html",
+      "distribute/engage/deep-linking.html",
       "distribute/engage/analytics.html",
       "distribute/engage/game-services.html",
       "distribute/engage/app-updates.html",
@@ -659,7 +659,7 @@
     "resources": [
       "https://developers.google.com/app-indexing/",
       "https://developers.google.com/app-indexing/webmasters/details",
-      "distribute/engage/appindexing.html"
+      "distribute/engage/deep-linking.html"
     ]
   },
   "distribute/users/otas": {
@@ -924,7 +924,7 @@
     "title": "",
     "resources": [
       "distribute/engage/intents.html",
-      "distribute/engage/appindexing.html",
+      "distribute/engage/deep-linking.html",
       "distribute/users/appindexing.html"
     ]
   },
@@ -932,7 +932,7 @@
     "title": "",
     "resources": [
       "guide/components/intents-filters.html",
-      "distribute/engage/appindexing.html",
+      "distribute/engage/deep-linking.html",
       "distribute/engage/ads.html"
     ]
   },
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index eb9639d..5d17679 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -140,7 +140,7 @@
     "group":"",
     "keywords": ["push","gcm"],
     "tags": [],
-    "image":"images/gcm/gcm-logo.png",
+    "image":"images/cards/card-google-cloud-messaging_16-9_2x.png",
     "type":"Guide"
   },
   {
@@ -485,9 +485,9 @@
     "summary":"Tools to offer a better game experience.",
     "url":"google/play-services/games.html",
     "group":"",
-    "keywords": [],
+    "keywords": ["games","play games"],
     "tags": [],
-    "image":"",
+    "image":"images/google/gps-play_games_logo.png",
     "type":"google"
   },
 
@@ -1006,8 +1006,8 @@
     "tags": [],
     "url": "https://developers.google.com/wallet/instant-buy/",
     "timestamp": 1194884220000,
-    "image": "distribute/images/payment-method.jpg",
-    "title": "Google Wallet Instant Buy APIs",
+    "image": "",
+    "title": "Android Pay APIs",
     "summary": "Developer documentation describing Instant Buy and how to support it in your apps.",
     "keywords": [],
     "type": "guide",
@@ -3231,21 +3231,21 @@
     "title": "Designed for Families",
     "summary": "Introducing a new Google Play section to promote family friendly apps. Your apps in the program can benefit from enhanced discoverability in addition to maintaining their existing categories, rankings, and reviews elsewhere on the Google Play store."
   },
-  "http://www.youtube.com/watch?v=Pd49vTkvu0U&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c": {
+  "https://www.youtube.com/watch?v=Pd49vTkvu0U": {
     "image": "images/distribute/hero-jelly-button.jpg",
     "title": "How Jelly Button Games are growing globally through data",
     "summary": "To really understand their users, Jelly Button Games analyses over 3 billion events each month using Google Analytics and Google BigQuery."
   },
-  "http://www.youtube.com/watch?v=700gYRkhkLM&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c": {
+  "http://www.youtube.com/watch?v=700gYRkhkLM%26list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c": {
     "image": "images/distribute/hero-outfit7.jpg",
     "title": "Outfit7 — Building an entertainment company with Google",
     "summary": "Outfit7, creators of My Talking Tom and My Talking Angela, offer a complete entertainment experience to users spanning mobile apps, user generated and original YouTube content, and a range of toys, clothing, and accessories...."
   },
-  "http://www.youtube.com/watch?v=MPnH7h12h0U&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c": {
+  "http://www.youtube.com/watch?v=MPnH7h12h0U%26list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c": {
     "image": "images/distribute/hero-haystack.jpg",
     "summary": "Haystack TV built a scalable business with six employees and Android TV. Two weeks was all it took for them to bring their mobile app to the big screen."
   },
-  "http://www.youtube.com/watch?v=ekxABqJeRBc&list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c": {
+  "http://www.youtube.com/watch?v=ekxABqJeRBc%26list=PLWz5rJ2EKKc9ofd2f-_-xmUi07wIGZa1c": {
     "image": "images/distribute/hero-ginlemon.jpg",
     "title": "How GinLemon is breaking through with Google Play",
     "summary": "Meet Vincenzo Colucci, developer and founder of GinLemon, which started as a summer holiday joke and has now become a successful global app business on Google Play based in Manfredonia, southern Italy."
diff --git a/docs/html/preview/samples.jd b/docs/html/preview/samples.jd
index 7e98188..29b9e2a 100644
--- a/docs/html/preview/samples.jd
+++ b/docs/html/preview/samples.jd
@@ -1,5 +1,5 @@
 page.title=Samples
-page.image=images/cards/card-samples_2x.png
+page.image=images/cards/card-samples_16-9_2x.png
 @jd:body
 
 <p>
@@ -7,6 +7,7 @@
   Android SDK Manager under the <b>SDK Samples</b> component for the M Developer Preview.
 </p>
 
+<img src="{@docRoot}images/cards/card-google-cloud-messaging_16-9_2x" class="figure">
 <p class="note">
   <strong>Note:</strong> These downloadable projects are designed
    for use with Gradle and Android Studio.
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 5f795ce..27c5fb6 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -270,7 +270,7 @@
 
 <img src="{@docRoot}images/tools/studio-hero.png"
 srcset="{@docRoot}images/tools/studio-hero_2x.png 2x, {@docRoot}images/tools/studio-hero.png 1x"
-width="760" height="400" alt="" />
+width="760" alt="" />
 
 <div style="color: #fff; width:226px; height:0; overflow:visible; position:absolute; top:40px; left:25px">
 
diff --git a/docs/html/training/index.jd b/docs/html/training/index.jd
index 862e185..44b6747 100644
--- a/docs/html/training/index.jd
+++ b/docs/html/training/index.jd
@@ -27,6 +27,7 @@
 </div>
 
 <div style="clear:left"></div>
+</div>
 
   <div><h2 class="norule">Online video courses</h2>
   <p>If you prefer to learn through interactive video training,
@@ -37,5 +38,4 @@
        data-cardSizes="6x6"
        data-maxResults="9"
        data-initial-results="3"></div>
-</div>
 </div>
\ No newline at end of file