am 613e19b7: SDK Only: Fix search interaction with various samples.

* commit '613e19b74072896464e1980d84dc27c2a9f4471a':
  SDK Only: Fix search interaction with various samples.