Snap for 8701376 from f2dd0b7ea7ad56b1bdcc8ead3dd0e221210c9770 to mainline-appsearch-release

Change-Id: Ia6cef445bcacf7a48e5e884b339c47c5af9f1345