DO NOT MERGE merge from donut-gms
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bffa88b..d5d8281 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,6 +23,7 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
         android:process="android.process.acore"
diff --git a/res/values-mcc204/strings.xml b/res/values-mcc204/strings.xml
index 0415345..14c1b7c 100644
--- a/res/values-mcc204/strings.xml
+++ b/res/values-mcc204/strings.xml
@@ -24,6 +24,6 @@
     <!-- Any changes to this (especially in terms of adding/removing the MCC-specific flavors) -->
     <!-- should be mirrored by changes in apps/Browser. -->
     <!-- Do not translate.  This string is an internal URI, not seen in the UI. -->
-    <string name="google_search_base" translatable="false">
+    <string name="google_suggest_base" translatable="false">
         http://www.google.com/complete/search?hl=%1$s&amp;gl=nl&amp;</string>
 </resources>
diff --git a/res/values-mcc230/strings.xml b/res/values-mcc230/strings.xml
index bd19cdc..faa7784 100644
--- a/res/values-mcc230/strings.xml
+++ b/res/values-mcc230/strings.xml
@@ -23,6 +23,6 @@
     <!-- Any changes to this (especially in terms of adding/removing the MCC-specific flavors) -->
     <!-- should be mirrored by changes in apps/Browser. -->
     <!-- Do not translate.  This string is an internal URI, not seen in the UI. -->
-    <string name="google_search_base" translatable="false">
+    <string name="google_suggest_base" translatable="false">
         http://www.google.com/complete/search?hl=%1$s&amp;gl=cz&amp;</string>
 </resources>
diff --git a/res/values-mcc232/strings.xml b/res/values-mcc232/strings.xml
index ca884a0..c1fb564 100644
--- a/res/values-mcc232/strings.xml
+++ b/res/values-mcc232/strings.xml
@@ -23,6 +23,6 @@
     <!-- Any changes to this (especially in terms of adding/removing the MCC-specific flavors) -->
     <!-- should be mirrored by changes in apps/Browser. -->
     <!-- Do not translate.  This string is an internal URI, not seen in the UI. -->
-    <string name="google_search_base" translatable="false">
+    <string name="google_suggest_base" translatable="false">
         http://www.google.com/complete/search?hl=%1$s&amp;gl=at&amp;</string>
 </resources>
diff --git a/res/values-mcc260/strings.xml b/res/values-mcc260/strings.xml
index 9ed2d40..6eb1ad6 100644
--- a/res/values-mcc260/strings.xml
+++ b/res/values-mcc260/strings.xml
@@ -23,5 +23,5 @@
     <!-- don't support this countries locale.  -->
     <!-- Any changes to this (especially in terms of adding/removing the MCC-specific flavors) -->
     <!-- should be mirrored by changes in apps/Browser. -->
-    <string translatable="false" name="google_search_base">http://www.google.com/complete/search?hl=%1$s&amp;gl=pl&amp;</string>
+    <string translatable="false" name="google_suggest_base">http://www.google.com/complete/search?hl=%1$s&amp;gl=pl&amp;</string>
 </resources>
diff --git a/res/values-mcc262/strings.xml b/res/values-mcc262/strings.xml
index 1dfd68a..1d191a9 100644
--- a/res/values-mcc262/strings.xml
+++ b/res/values-mcc262/strings.xml
@@ -23,6 +23,6 @@
     <!-- Any changes to this (especially in terms of adding/removing the MCC-specific flavors) -->
     <!-- should be mirrored by changes in apps/Browser. -->
     <!-- Do not translate.  This string is an internal URI, not seen in the UI. -->
-    <string name="google_search_base" translatable="false">
+    <string name="google_suggest_base" translatable="false">
         http://www.google.com/complete/search?hl=%1$s&amp;gl=de&amp;</string>
 </resources>