diff --git a/DEPS b/DEPS
index 5d24350..03875ed8 100644
--- a/DEPS
+++ b/DEPS
@@ -40,7 +40,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'f4e498601755073fb43cdbe8db02f236ce1249a3',
+  'skia_revision': 'bba02c203190a19bce7eb60887c4ae64041c8ae8',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
diff --git a/chrome/browser/resources/md_bookmarks/app.js b/chrome/browser/resources/md_bookmarks/app.js
index 7bc97e9..50c783cd 100644
--- a/chrome/browser/resources/md_bookmarks/app.js
+++ b/chrome/browser/resources/md_bookmarks/app.js
@@ -57,6 +57,12 @@
       bookmarks.Store.getInstance().init(initialState);
       bookmarks.ApiListener.init();
 
+      setTimeout(function() {
+        chrome.metricsPrivate.recordTime(
+            'BookmarkManager.ResultsRenderedTime',
+            Math.floor(window.performance.now()));
+      });
+
     }.bind(this));
 
     this.boundUpdateSidebarWidth_ = this.updateSidebarWidth_.bind(this);
diff --git a/chrome/test/chromedriver/capabilities_unittest.cc b/chrome/test/chromedriver/capabilities_unittest.cc
index 1e50352..ff12c37a 100644
--- a/chrome/test/chromedriver/capabilities_unittest.cc
+++ b/chrome/test/chromedriver/capabilities_unittest.cc
@@ -512,7 +512,7 @@
 TEST(ParseCapabilities, MobileEmulationDeviceName) {
   Capabilities capabilities;
   base::DictionaryValue mobile_emulation;
-  mobile_emulation.SetString("deviceName", "Google Nexus 5");
+  mobile_emulation.SetString("deviceName", "Nexus 5");
   base::DictionaryValue caps;
   caps.Set("chromeOptions.mobileEmulation",
            base::MakeUnique<base::Value>(mobile_emulation));
@@ -522,8 +522,8 @@
   ASSERT_EQ(1u, capabilities.switches.GetSize());
   ASSERT_TRUE(capabilities.switches.HasSwitch("user-agent"));
   ASSERT_EQ(
-      "Mozilla/5.0 (Linux; Android 4.4.4; Nexus 5 Build/KTU84P) "
-      "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.114 Mobile "
+      "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) "
+      "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile "
       "Safari/537.36",
       capabilities.switches.GetSwitchValue("user-agent"));
 
diff --git a/chrome/test/chromedriver/chrome/mobile_device_list.cc b/chrome/test/chromedriver/chrome/mobile_device_list.cc
index 13cd982..fdf7a04 100644
--- a/chrome/test/chromedriver/chrome/mobile_device_list.cc
+++ b/chrome/test/chromedriver/chrome/mobile_device_list.cc
@@ -1,103 +1,120 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file was generated at (2015-10-05 13:42:15.387188) by running:
-//     chrome/test/chromedriver/embed_mobile_devices_in_cpp.py --directory
+// This file was generated at (2017-06-01 20:57:49.161613) by running:
+//     ./chrome/test/chromedriver/embed_mobile_devices_in_cpp.py --directory
 //     chrome/test/chromedriver/chrome/
 //     third_party/WebKit/Source/devtools/front_end/emulated_devices/module.json
 
 #include "chrome/test/chromedriver/chrome/mobile_device_list.h"
 
 const char kMobileDevices[] =
-    "{\"Laptop with touch\": {\"deviceScaleFactor\": 1, \"mobile\": false, "
-    "\"height\": 1280, \"width\": 950, \"touch\": true, \"userAgent\": \"\"}, "
-    "\"BlackBerry Z30\": {\"deviceScaleFactor\": 2, \"mobile\": true, "
-    "\"height\": 640, \"width\": 360, \"touch\": true, \"userAgent\": "
-    "\"Mozilla/5.0 (BB10; Touch) AppleWebKit/537.10+ (KHTML, like Gecko) "
-    "Version/10.0.9.2372 Mobile Safari/537.10+\"}, \"Google Nexus 6\": "
+    "{\"iPad\": {\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 1024, "
+    "\"width\": 768, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (iPad; CPU "
+    "OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) "
+    "Version/9.0 Mobile/13B143 Safari/601.1\"}, \"Laptop with touch\": "
+    "{\"deviceScaleFactor\": 1, \"mobile\": false, \"height\": 1280, "
+    "\"width\": 950, \"touch\": true, \"userAgent\": \"\"}, \"BlackBerry "
+    "Z30\": {\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 640, "
+    "\"width\": 360, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (BB10; "
+    "Touch) AppleWebKit/537.10+ (KHTML, like Gecko) Version/10.0.9.2372 Mobile "
+    "Safari/537.10+\"}, \"Nexus 6\": {\"deviceScaleFactor\": 3.5, \"mobile\": "
+    "true, \"height\": 732, \"width\": 412, \"touch\": true, \"userAgent\": "
+    "\"Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E) "
+    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36\"}, "
+    "\"LG Optimus L70\": {\"deviceScaleFactor\": 1.25, \"mobile\": true, "
+    "\"height\": 640, \"width\": 384, \"touch\": true, \"userAgent\": "
+    "\"Mozilla/5.0 (Linux; U; Android 4.4.2; en-us; LGMS323 "
+    "Build/KOT49I.MS32310c) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 "
+    "Chrome/%s Mobile Safari/537.36\"}, \"Nexus 4\": {\"deviceScaleFactor\": "
+    "2, \"mobile\": true, \"height\": 640, \"width\": 384, \"touch\": true, "
+    "\"userAgent\": \"Mozilla/5.0 (Linux; Android 4.4.2; Nexus 4 Build/KOT49H) "
+    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36\"}, "
+    "\"Nexus 5\": {\"deviceScaleFactor\": 3, \"mobile\": true, \"height\": "
+    "640, \"width\": 360, \"touch\": true, \"userAgent\": \"Mozilla/5.0 "
+    "(Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, "
+    "like Gecko) Chrome/%s Mobile Safari/537.36\"}, \"Blackberry PlayBook\": "
+    "{\"deviceScaleFactor\": 1, \"mobile\": true, \"height\": 1024, \"width\": "
+    "600, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (PlayBook; U; RIM "
+    "Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) "
+    "Version/7.2.1.0 Safari/536.2+\"}, \"Galaxy Note 3\": "
+    "{\"deviceScaleFactor\": 3, \"mobile\": true, \"height\": 640, \"width\": "
+    "360, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; U; Android "
+    "4.3; en-us; SM-N900T Build/JSS15J) AppleWebKit/534.30 (KHTML, like Gecko) "
+    "Version/4.0 Mobile Safari/534.30\"}, \"Nexus 6P\": "
     "{\"deviceScaleFactor\": 3.5, \"mobile\": true, \"height\": 732, "
     "\"width\": 412, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; "
     "Android 5.1.1; Nexus 6 Build/LYZ28E) AppleWebKit/537.36 (KHTML, like "
-    "Gecko) Chrome/44.0.2403.20 Mobile Safari/537.36\"}, \"Google Nexus 7\": "
+    "Gecko) Chrome/%s Mobile Safari/537.36\"}, \"Laptop with HiDPI screen\": "
+    "{\"deviceScaleFactor\": 2, \"mobile\": false, \"height\": 1440, "
+    "\"width\": 900, \"touch\": false, \"userAgent\": \"\"}, \"Nexus 7\": "
     "{\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 960, \"width\": "
     "600, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; Android 4.3; "
-    "Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) "
-    "Chrome/42.0.2307.2 Safari/537.36\"}, \"Google Nexus 4\": "
-    "{\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 640, \"width\": "
-    "384, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; Android 4.4.2; "
-    "Nexus 4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) "
-    "Chrome/35.0.1916.122 Mobile Safari/537.36\"}, \"Google Nexus 5\": "
-    "{\"deviceScaleFactor\": 3, \"mobile\": true, \"height\": 640, \"width\": "
-    "360, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; Android 4.4.4; "
-    "Nexus 5 Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) "
-    "Chrome/38.0.2125.114 Mobile Safari/537.36\"}, \"Apple iPad\": "
+    "Nexus 7 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s "
+    "Safari/537.36\"}, \"Nokia N9\": {\"deviceScaleFactor\": 1, \"mobile\": "
+    "true, \"height\": 640, \"width\": 360, \"touch\": true, \"userAgent\": "
+    "\"Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) "
+    "NokiaBrowser/8.5.0 Mobile Safari/534.13\"}, \"Nokia Lumia 520\": "
+    "{\"deviceScaleFactor\": 1.5, \"mobile\": true, \"height\": 533, "
+    "\"width\": 320, \"touch\": true, \"userAgent\": \"Mozilla/5.0 "
+    "(compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; "
+    "ARM; Touch; NOKIA; Lumia 520)\"}, \"Nexus 10\": {\"deviceScaleFactor\": "
+    "2, \"mobile\": true, \"height\": 1280, \"width\": 800, \"touch\": true, "
+    "\"userAgent\": \"Mozilla/5.0 (Linux; Android 4.3; Nexus 10 Build/JSS15Q) "
+    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Safari/537.36\"}, "
+    "\"Microsoft Lumia 950\": {\"deviceScaleFactor\": 4, \"mobile\": true, "
+    "\"height\": 640, \"width\": 360, \"touch\": true, \"userAgent\": "
+    "\"Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; Microsoft; Lumia 950) "
+    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2486.0 Mobile "
+    "Safari/537.36 Edge/14.14263\"}, \"iPhone 5\": {\"deviceScaleFactor\": 2, "
+    "\"mobile\": true, \"height\": 568, \"width\": 320, \"touch\": true, "
+    "\"userAgent\": \"Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) "
+    "AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 "
+    "Safari/601.1\"}, \"iPhone 4\": {\"deviceScaleFactor\": 2, \"mobile\": "
+    "true, \"height\": 480, \"width\": 320, \"touch\": true, \"userAgent\": "
+    "\"Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) "
+    "AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 "
+    "Safari/601.1\"}, \"iPhone 6\": {\"deviceScaleFactor\": 2, \"mobile\": "
+    "true, \"height\": 667, \"width\": 375, \"touch\": true, \"userAgent\": "
+    "\"Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) "
+    "AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 "
+    "Safari/601.1\"}, \"Galaxy S III\": {\"deviceScaleFactor\": 2, \"mobile\": "
+    "true, \"height\": 640, \"width\": 360, \"touch\": true, \"userAgent\": "
+    "\"Mozilla/5.0 (Linux; U; Android 4.0; en-us; GT-I9300 Build/IMM76D) "
+    "AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile "
+    "Safari/534.30\"}, \"Microsoft Lumia 550\": {\"deviceScaleFactor\": 2, "
+    "\"mobile\": true, \"height\": 360, \"width\": 640, \"touch\": true, "
+    "\"userAgent\": \"Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; "
+    "Microsoft; Lumia 550) AppleWebKit/537.36 (KHTML, like Gecko) "
+    "Chrome/46.0.2486.0 Mobile Safari/537.36 Edge/14.14263\"}, \"iPad Mini\": "
     "{\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 1024, \"width\": "
-    "768, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (iPad; CPU OS 7_0 like "
-    "Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 "
-    "Mobile/11A465 Safari/9537.53\"}, \"Laptop with HiDPI screen\": "
-    "{\"deviceScaleFactor\": 2, \"mobile\": false, \"height\": 1440, "
-    "\"width\": 900, \"touch\": false, \"userAgent\": \"\"}, \"Samsung Galaxy "
-    "Note II\": {\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 640, "
-    "\"width\": 360, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; U; "
-    "Android 4.1; en-us; GT-N7100 Build/JRO03C) AppleWebKit/534.30 (KHTML, "
-    "like Gecko) Version/4.0 Mobile Safari/534.30\"}, \"Nokia N9\": "
-    "{\"deviceScaleFactor\": 1, \"mobile\": true, \"height\": 640, \"width\": "
-    "360, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (MeeGo; NokiaN9) "
-    "AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile "
-    "Safari/534.13\"}, \"Samsung Galaxy S4\": {\"deviceScaleFactor\": 3, "
-    "\"mobile\": true, \"height\": 640, \"width\": 360, \"touch\": true, "
-    "\"userAgent\": \"Mozilla/5.0 (Linux; Android 4.2.2; GT-I9505 Build/JDQ39) "
-    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.59 Mobile "
-    "Safari/537.36\"}, \"Nokia Lumia 520\": {\"deviceScaleFactor\": 1.4, "
-    "\"mobile\": true, \"height\": 533, \"width\": 320, \"touch\": true, "
-    "\"userAgent\": \"Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; "
-    "Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 520)\"}, "
-    "\"BlackBerry PlayBook\": {\"deviceScaleFactor\": 1, \"mobile\": true, "
-    "\"height\": 1024, \"width\": 600, \"touch\": true, \"userAgent\": "
-    "\"Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) "
-    "AppleWebKit/536.2+ (KHTML like Gecko) Version/7.2.1.0 Safari/536.2+\"}, "
-    "\"Apple iPhone 5\": {\"deviceScaleFactor\": 2, \"mobile\": true, "
-    "\"height\": 568, \"width\": 320, \"touch\": true, \"userAgent\": "
-    "\"Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) "
-    "AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 "
-    "Safari/9537.53\"}, \"Apple iPhone 4\": {\"deviceScaleFactor\": 2, "
-    "\"mobile\": true, \"height\": 480, \"width\": 320, \"touch\": true, "
-    "\"userAgent\": \"Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_2_1 like Mac OS "
-    "X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 "
-    "Mobile/8C148 Safari/6533.18.5\"}, \"Apple iPhone 6\": "
-    "{\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 667, \"width\": "
-    "375, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (iPhone; CPU iPhone OS "
-    "8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 "
-    "Mobile/12A4345d Safari/600.1.4\"}, \"LG Optimus L70\": "
-    "{\"deviceScaleFactor\": 1.25, \"mobile\": true, \"height\": 640, "
-    "\"width\": 384, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; U; "
-    "Android 4.4.2; en-us; LGMS323 Build/KOT49I.MS32310c) AppleWebKit/537.36 "
-    "(KHTML, like Gecko) Version/4.0 Chrome/30.0.1599.103 Mobile "
-    "Safari/537.36\"}, \"Apple iPhone 6 Plus\": {\"deviceScaleFactor\": 3, "
+    "768, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (iPad; CPU OS 9_1 like "
+    "Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 "
+    "Mobile/13B143 Safari/601.1\"}, \"iPad Pro\": {\"deviceScaleFactor\": 2, "
+    "\"mobile\": true, \"height\": 1366, \"width\": 1024, \"touch\": true, "
+    "\"userAgent\": \"Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) "
+    "AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 "
+    "Safari/601.1\"}, \"Nexus 5X\": {\"deviceScaleFactor\": 2.625, \"mobile\": "
+    "true, \"height\": 732, \"width\": 412, \"touch\": true, \"userAgent\": "
+    "\"Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) "
+    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36\"}, "
+    "\"Galaxy Note II\": {\"deviceScaleFactor\": 2, \"mobile\": true, "
+    "\"height\": 640, \"width\": 360, \"touch\": true, \"userAgent\": "
+    "\"Mozilla/5.0 (Linux; U; Android 4.1; en-us; GT-N7100 Build/JRO03C) "
+    "AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile "
+    "Safari/534.30\"}, \"iPhone 6 Plus\": {\"deviceScaleFactor\": 3, "
     "\"mobile\": true, \"height\": 736, \"width\": 414, \"touch\": true, "
-    "\"userAgent\": \"Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) "
-    "AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d "
-    "Safari/600.1.4\"}, \"Apple iPad Mini\": {\"deviceScaleFactor\": 2, "
-    "\"mobile\": true, \"height\": 1024, \"width\": 768, \"touch\": true, "
-    "\"userAgent\": \"Mozilla/5.0 (iPad; CPU OS 7_0_4 like Mac OS X) "
-    "AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11B554a "
-    "Safari/9537.53\"}, \"Amazon Kindle Fire HDX\": {\"deviceScaleFactor\": 2, "
-    "\"mobile\": true, \"height\": 2560, \"width\": 1600, \"touch\": true, "
-    "\"userAgent\": \"Mozilla/5.0 (Linux; U; en-us; KFAPWI Build/JDQ39) "
-    "AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.13 Safari/535.19 "
-    "Silk-Accelerated=true\"}, \"Samsung Galaxy S III\": "
-    "{\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 640, \"width\": "
-    "360, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; U; Android "
-    "4.0; en-us; GT-I9300 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) "
-    "Version/4.0 Mobile Safari/534.30\"}, \"Laptop with MDPI screen\": "
-    "{\"deviceScaleFactor\": 1, \"mobile\": false, \"height\": 1280, "
-    "\"width\": 800, \"touch\": false, \"userAgent\": \"\"}, \"Samsung Galaxy "
-    "Note 3\": {\"deviceScaleFactor\": 3, \"mobile\": true, \"height\": 640, "
-    "\"width\": 360, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; U; "
-    "Android 4.3; en-us; SM-N900T Build/JSS15J) AppleWebKit/534.30 (KHTML, "
-    "like Gecko) Version/4.0 Mobile Safari/534.30\"}, \"Google Nexus 10\": "
-    "{\"deviceScaleFactor\": 2, \"mobile\": true, \"height\": 1280, \"width\": "
-    "800, \"touch\": true, \"userAgent\": \"Mozilla/5.0 (Linux; Android 4.3; "
-    "Nexus 10 Build/JSS15Q) AppleWebKit/537.36 (KHTML, like Gecko) "
-    "Chrome/42.0.2307.2 Safari/537.36\"}}";
+    "\"userAgent\": \"Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) "
+    "AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 "
+    "Safari/601.1\"}, \"Galaxy S5\": {\"deviceScaleFactor\": 3, \"mobile\": "
+    "true, \"height\": 640, \"width\": 360, \"touch\": true, \"userAgent\": "
+    "\"Mozilla/5.0 (Linux; Android 5.0; SM-G900P Build/LRX21T) "
+    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/%s Mobile Safari/537.36\"}, "
+    "\"Kindle Fire HDX\": {\"deviceScaleFactor\": 2, \"mobile\": true, "
+    "\"height\": 2560, \"width\": 1600, \"touch\": true, \"userAgent\": "
+    "\"Mozilla/5.0 (Linux; U; en-us; KFAPWI Build/JDQ39) AppleWebKit/535.19 "
+    "(KHTML, like Gecko) Silk/3.13 Safari/535.19 Silk-Accelerated=true\"}, "
+    "\"Laptop with MDPI screen\": {\"deviceScaleFactor\": 1, \"mobile\": "
+    "false, \"height\": 1280, \"width\": 800, \"touch\": false, \"userAgent\": "
+    "\"\"}}";
diff --git a/chrome/test/chromedriver/chrome/mobile_device_list.h b/chrome/test/chromedriver/chrome/mobile_device_list.h
index d11484f..37aff49c 100644
--- a/chrome/test/chromedriver/chrome/mobile_device_list.h
+++ b/chrome/test/chromedriver/chrome/mobile_device_list.h
@@ -1,9 +1,9 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file was generated at (2015-10-05 13:42:15.387188) by running:
-//     chrome/test/chromedriver/embed_mobile_devices_in_cpp.py --directory
+// This file was generated at (2017-06-01 20:57:49.161613) by running:
+//     ./chrome/test/chromedriver/embed_mobile_devices_in_cpp.py --directory
 //     chrome/test/chromedriver/chrome/
 //     third_party/WebKit/Source/devtools/front_end/emulated_devices/module.json
 
diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json
index 6227d47..8b729a0f 100644
--- a/extensions/common/api/_api_features.json
+++ b/extensions/common/api/_api_features.json
@@ -248,6 +248,7 @@
     "channel": "stable",
     "contexts": ["webui"],
     "matches": [
+      "chrome://bookmarks/*",
       "chrome://md-settings/*",
       "chrome://settings/*",
       "chrome://settings-frame/*"