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

* commit '3509481cfae4b8dc0fdba4836bfc36e2bd04045e':
  SDK Only: Fix search interaction with various samples.