diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 61617ebe94252..153ebcbf9f73f 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -34,7 +34,7 @@ position:absolute;top:50%;left:0;width:100%;z-index:-1;text-align:center;display
                  <div class="col-8">
                    <img src="{@docRoot}images/google/maps-v2-trulia-n7.png"
 class="play no-shadow no-transform" style="margin:0 0 0 40px;max-height:250px;height:250px;
-                                           max-width:403px;width:403px" />
+                                           max-width:409px;width:409px" />
                  </div>
                 <div class="content-right col-6" style="width:350px">
                   <h2>New MapView APIs!</h2>
diff --git a/docs/html/google/google_toc.cs b/docs/html/google/google_toc.cs
index 0eeff9dc3ed65..fac3511a1245d 100644
--- a/docs/html/google/google_toc.cs
+++ b/docs/html/google/google_toc.cs
@@ -31,7 +31,7 @@
       </li>
 
       <li><a href="<?cs var:toroot?>google/play-services/maps.html">
-          <span class="en">Maps</span></a>
+          <span class="en">Google Maps</span></a>
       </li>
 
       <li id="tree-list" class="nav-section">
@@ -53,7 +53,7 @@
 
   <li class="nav-section">
     <div class="nav-section-header"><a href="<?cs var:toroot ?>google/play/billing/index.html">
-      <span class="en">Google Play <br />In-app Billing</span></a>
+      <span class="en">Google Play In-app Billing</span></a>
     </div>
     <ul>
           <li><a href="<?cs var:toroot?>google/play/billing/billing_overview.html">
@@ -82,7 +82,7 @@
 
   <li class="nav-section">
     <div class="nav-section-header"><a href="<?cs var:toroot ?>google/play/dist.html">
-      <span class="en">Google Play Distribution and Licensing</span></a>
+      <span class="en">Google Play Distribution</span></a>
     </div>
     <ul>
       <li><a href="<?cs var:toroot ?>google/play/filters.html">
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index 97e4ea43b1766..dd6e278fe05d6 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -29,7 +29,7 @@ enhance your app's capabilities, build new revenue streams, manage app distribut
 and track app usage.</p>
   <p>Because these services are offered directly by Google, they're not included in
   the Android platform. Some are provided by the Google Play
-  service on users' devices, which receives updates from the Google Play Store,
+  service available on devices with Google Play,
   and others require a library added to your app.</p>
 </div>
 </div>
@@ -45,7 +45,8 @@ and track app usage.</p>
   <div class="cell-icon">
   <img src="{@docRoot}images/google/maps-pin.png">
   </div>
-    <h4><a href="{@docRoot}google/play-services/maps.html">Google Maps API</a></h4>
+    <h4><a href="{@docRoot}google/play-services/maps.html"
+    >Google Maps</a></h4>
     <p>The power of Google Maps is available to your app
     with an embeddable map view. You can customize the map with
     markers and overlays, control the user's perspective, animate the camera, and much more.</p>
@@ -55,7 +56,8 @@ and track app usage.</p>
   <div class="cell-icon">
   <img src="{@docRoot}images/google/plus-one.png">
   </div>
-    <h4><a href="{@docRoot}google/play-services/plus.html">Google+ API</a></h4>
+    <h4><a href="{@docRoot}google/play-services/plus.html"
+    >Google+</a></h4>
     <p>Authenticate your users by allowing them to sign in with Google+.
     Provide +1 buttons that allow users to recommend your app content and build customized
     content for posts on Google+.</p>
@@ -65,7 +67,8 @@ and track app usage.</p>
   <div class="cell-icon">
   <img src="{@docRoot}images/google/gcm-cloud.png">
   </div>
-    <h4><a href="{@docRoot}google/gcm/index.html">Google Cloud Messaging</a></h4>
+    <h4><a href="{@docRoot}google/gcm/index.html"
+    >Google Cloud Messaging</a></h4>
     <p>Keep your users connected by delivering events with
     lightweight messages immediately from your web server. There are no quotas or charges
     to use Google Cloud Messaging.</p>
@@ -82,7 +85,8 @@ and track app usage.</p>
   <div class="cell-icon">
     <img src="{@docRoot}images/google/iab-99c.png" />
   </div>
-    <h4><a href="{@docRoot}google/play/billing/index.html">In-App Billing</a></h4>
+    <h4><a href="{@docRoot}google/play/billing/index.html"
+    >Google Play In-App Billing</a></h4>
     <p>Build an app with a steady revenue stream that keeps users engaged
     by offering new content or virtual goods directly in your app. All transactions are handled
     by Google Play Store for a simple user experience.
@@ -94,7 +98,8 @@ and track app usage.</p>
 <img src="{@docRoot}images/google/analytics.png" />
   </div>
     <h4><a class="external-link" 
-href="https://developers.google.com/analytics/devguides/collection/android/v2/">Analytics</a></h4>
+href="https://developers.google.com/analytics/devguides/collection/android/v2/"
+  >Google Analytics</a></h4>
 
 <p>Measure your success and gain deeper insights into how mobile users engage with your content
 by integrating Google Analytics with your app.</p>
@@ -104,7 +109,8 @@ by integrating Google Analytics with your app.</p>
   <div class="cell-icon">
     <img src="{@docRoot}images/google/admob-money.png" />
   </div>
-    <h4><a class="external-link" href="http://www.google.com/ads/admob/index.html">AdMob Ads</a></h4>
+    <h4><a class="external-link" href="https://developers.google.com/mobile-ads-sdk/"
+    >Google AdMob Ads</a></h4>
     <p>Display ads from AdMob offer you an alternative revenue opportunity that leverages
     multiple ad networks.
     </p>
diff --git a/docs/html/google/play-services/maps.jd b/docs/html/google/play-services/maps.jd
index d2973c3eceb45..9013c7545b2bf 100644
--- a/docs/html/google/play-services/maps.jd
+++ b/docs/html/google/play-services/maps.jd
@@ -1,4 +1,4 @@
-page.title=Google Maps
+page.title=Google Maps Android API
 header.hide=1
 
 @jd:body
@@ -11,7 +11,7 @@ header.hide=1
 </div>
 <div class="col-6">
 
-  <h1 itemprop="name" style="margin-bottom:0;">Google Maps</h1>
+  <h1 itemprop="name" style="margin-bottom:0;">Google Maps Android API</h1>
   <p itemprop="description">Allow your users explore the world with rich maps provided by
   Google. Identify locations with <b>custom markers</b>, augment the map data
   with <b>image overlays</b>, embed <b>one or more maps</b> as fragments,
@@ -79,6 +79,8 @@ href="https://developers.google.com/maps/documentation/android/">developers.goog
     Google Maps developer documents at <a class="external-link"
     href="https://developers.google.com/maps/documentation/android/">developers.google.com/maps</a>.
     </p>
+    <p>Be sure to read the <a href="https://devsite.googleplex.com/maps/terms">Google Maps
+    API Terms of Service</a>.</p>
   </div>
 
 
diff --git a/docs/html/google/play-services/plus.jd b/docs/html/google/play-services/plus.jd
index 98119ea9ab4ef..6ea2c13e93113 100644
--- a/docs/html/google/play-services/plus.jd
+++ b/docs/html/google/play-services/plus.jd
@@ -1,4 +1,4 @@
-page.title=Google+
+page.title=Google+ Platform for Android
 header.hide=1
 
 @jd:body
@@ -11,7 +11,7 @@ header.hide=1
 </div>
 <div class="col-6">
 
-  <h1 itemprop="name" style="margin-bottom:0;">Google+</h1>
+  <h1 itemprop="name" style="margin-bottom:0;">Google+ Platform for Android</h1>
   <p itemprop="description">Create an engaging social experience
   by integrating Google+ features in your app. You can <b>authenticate users</b> and allow them to
   <b>sign in</b>, add +1 buttons so users can <b>recommend your app content</b>,
@@ -78,6 +78,7 @@ href="https://developers.google.com/+/mobile/android/">developers.google.com/+</
     <p>Extended documentation for the Google+ Android APIs is provided with the rest of the
     Google+ developer documents at <a class="external-link"
     href="https://developers.google.com/+/mobile/android/">developers.google.com/+</a>.</p>
-    
+    <p>Be sure to read the <a href="https://developers.google.com/+/terms">Google+ Platform
+    Terms of Service</a>.</p>
   </div>
 </div>
\ No newline at end of file
diff --git a/docs/html/google/play/dist.jd b/docs/html/google/play/dist.jd
index 20523f6ec740c..b4efe40ca8b3b 100644
--- a/docs/html/google/play/dist.jd
+++ b/docs/html/google/play/dist.jd
@@ -1,4 +1,4 @@
-page.title=Google Play Distribution and Licensing
+page.title=Google Play Distribution
 @jd:body
 
 <p>