Snap for 8701376 from aa408ed4eaad12f82451a1e675beb117bd383bde to mainline-appsearch-release

Change-Id: I24f24d31f7952f4bcd692d48571de3254641c5ac