Snap for 8857176 from 0069ccdfa1ca4097b9070deffab572b148a8084d to mainline-go-appsearch-release

Change-Id: I7ad1a5df85bbea7ef7a88937355cbf23436e7b7b