Snap for 8736029 from 882a18888febb9cb0b9d6c6069498cbc4aa30f88 to mainline-go-appsearch-release

Change-Id: I7f123e77a513dd4dec68a7404423b987c17b498a