Snap for 10453563 from 3a543e6f6c078bdff87fb6f4348a9791716ac05c to mainline-appsearch-release

Change-Id: I434b6fdb01f80593953ad89204c02b724e253ce5