Snap for 8701376 from 338f328efb1ec01a88dcbc79999e093b98b9209f to mainline-appsearch-release Change-Id: I181797bf0bcd4fc7fab2594b6690cb051cbee64d