Snap for 10453563 from f0e069fa0d4f7e7f14e8b27761b9bb70d0f4502f to mainline-appsearch-release

Change-Id: Id104ddde4a587957902c6da61e65fb6211d69e39