am 2f2daf8e: (-s ours) Fix search intent component bug DO NOT MERGE

Merge commit '2f2daf8ed4d45ff68a0aeffcd0b284c45e5a5d82' into eclair

* commit '2f2daf8ed4d45ff68a0aeffcd0b284c45e5a5d82':
  Fix search intent component bug DO NOT MERGE