Snap for 10453563 from 335a13341bb8cc7feda1b96232ac28277629b8eb to mainline-appsearch-release

Change-Id: I92b3732cf8a8737b0231b207aab2e0d689f3dd77