Snap for 11051817 from f272e21eb9c896d3626bbe033396a6765dc00a1f to mainline-appsearch-release

Change-Id: I1ef612f6fe89eae22670d8fe436ae004c1d18a91