Snap for 8857176 from 42bafe9901e73ef5d68794d913a4a428415d38bc to mainline-go-appsearch-release

Change-Id: Idc402864145424dad0ce7d45199c25ee6076c362