merge from open-source master

Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c

diff --cc res/xml/settings.xml
Simple merge

diff --cc tests/AndroidManifest.xml
Simple merge

diff --cc tests/res/values/strings.xml
index 00de425,cd94a2d..9fb98f9
--- 1/tests/res/values/strings.xml
--- 2/tests/res/values/strings.xml
+++ b/tests/res/values/strings.xml
@@@ -20,6 -20,10 +20,12 @@@
      <!-- Test only. Do not translate. -->
      <string name="enable">Enable</string>
      <string name="discoverable">Discoverable</string>
 +    <string name="start_scan">Start scan</string>
 +    <string name="stop_scan">Stop scan</string>
+     <string name="operator_hello">Hello Operator!</string>
+     <string name="operator_settings_title">Operator</string>
+     <string name="operator_settings_summary">Operator hook that can be used to start activity of choice</string>
+     <string name="manufacturer_hello">Hello Manufacturer!</string>
+     <string name="manufacturer_settings_title">Manufacturer</string>
+     <string name="manufacturer_settings_summary">Manufacturer hook that can be used to start activity of choice</string>
  </resources>