diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 094fdc45df..dc73c7f088 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -2768,19 +2768,22 @@ Butterbar
   width:100%;
 }
 #butterbar {
-  width:940px;
+  width:100%;
   margin:0 auto;
 }
 #butterbar-message {
-  background-color:#f80;
-  float:right;
-  font-size:12px;
-  font-weight:bold;
-  padding:0 10px;
-  border-radius: 0 0 5px 5px;
+  background-color:rgba(255, 187, 51, .4);
+  font-size:13px;
+  padding: 5px 0;
+  text-align:center;
+}
+a#butterbar-message {
+  cursor:pointer;
+  display:block;
+}
+a#butterbar-message:hover {
+  text-decoration:underline;
 }
-#butterbar-message a {color:#fff !important}
-#butterbar-message a:hover {text-decoration:underline;}
 
 /* --------------------------------------------------------------------------
 Misc
@@ -4039,7 +4042,7 @@ EndColorStr='#ececec');
 #header-wrapper {
   background: #f9f9f9;
   margin: 0 -10px 0 -10px;
-  padding: 31px 10px 0px 10px;
+  padding: 51px 10px 0px 10px;
   position: relative;
 }
 #header-wrapper #nav-x div.wrap {
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index 43194ad3a4..3971b60d58 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -7,6 +7,13 @@
   <!-- Header -->
   <div id="header-wrapper">
     <div id="header">
+      <div id="butterbar-wrapper">
+        <div id="butterbar">
+          <a href="<?cs var:toroot ?>preview/index.html" id="butterbar-message">
+            The SDKs announced at Google IO will be available on June 26th!
+          </a>
+        </div>
+      </div>
       <div class="wrap" id="header-wrap">
         <div class="col-3 logo">
           <a href="<?cs var:toroot ?>index.html">
@@ -298,4 +305,4 @@ color:#666;font-weight:100;font-size:27px;">L Developer Preview</h1></div>
 </div>
 
   <?cs
-/def ?>
\ No newline at end of file
+/def ?>