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

Merge commit '6ac51e2b2defbc33834ec92d8a3e7c904f20811e'

* commit '6ac51e2b2defbc33834ec92d8a3e7c904f20811e':
  Fixes for changing the search engine.