Snap for 8701376 from 2a92d7a0bac4c274ed9753fdb51099c81004a0ce to mainline-appsearch-release

Change-Id: Ice790a6982729aa340a6f6f8e67e1398e87efa56