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

Merge commit '3558e360641e2c0dd119db573693441533509bcb'

* commit '3558e360641e2c0dd119db573693441533509bcb':
  Fix search intent component bug DO NOT MERGE