Snap for 8680285 from 3697166a0a033370e5ca7334c9d5cb0e64d86585 to mainline-go-appsearch-release

Change-Id: I3a60b258bf70bb307e83b9e04d3a230c440832d9