am 9d0c0b2f: am 033b5739: Merge "Remove Google Play specific search URIs from Settings." into klp-dev

* commit '9d0c0b2fecc84ea6c6e156be9d87f2f6e26b012b':
  Remove Google Play specific search URIs from Settings.