Snap for 11051817 from 62618d11a2e7875c438c5131abb6847da26aa6f4 to mainline-appsearch-release

Change-Id: Iabe954f99966dc27da282d1b627ac7a82d3082d1