Snap for 8701376 from 010e6902c351bb28c984d3e92330986cc47becb1 to mainline-appsearch-release

Change-Id: I87dea2efb7ff715b5f5d542dd2e94ab0534d38b9