am 430057da: Fixes for changing the search engine.

Merge commit '430057dad085f3c3dbc386f127b1f5a10a9851da' into gingerbread

* commit '430057dad085f3c3dbc386f127b1f5a10a9851da':
  Fixes for changing the search engine.