Snap for 11051817 from e165d0534409bffa4f319d96a4534f8138ae06d8 to mainline-appsearch-release

Change-Id: I341865a3bee6c9b05563e114a2f241ecb193bc19