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

Merge commit '3309940c04f2c4038f60c7eb0bc875df88197043' into eclair-plus-aosp

* commit '3309940c04f2c4038f60c7eb0bc875df88197043':
  Fix search intent component bug DO NOT MERGE