Snap for 10453563 from 888d07dacb839cfe377aebb029c587195bb26052 to mainline-appsearch-release

Change-Id: I0f87d4935a56ab7fb712a4f383a92bcdfff8af4e