Snap for 8857176 from a34afd602ed1ecfce82b35f2773591e199c7628c to mainline-go-appsearch-release

Change-Id: Ie0ab5b0953d2968ec5cca95175054ac05405e161