Snap for 10453563 from f80bca6977750793d7ac884a9b57a1bfa93e0ec7 to mainline-appsearch-release

Change-Id: Ie820e5dc6e12d9d88ec3b75b07c70d756c7fb01c