am 867c0465: am 430057da: Fixes for changing the search engine.

Merge commit '867c0465e9f5bd5da410fd9b721050d9e2c36c9c' into gingerbread-plus-aosp

* commit '867c0465e9f5bd5da410fd9b721050d9e2c36c9c':
  Fixes for changing the search engine.