Snap for 11051817 from 2557a9e5831be8341e28a6b8391a41f5037b1f1d to mainline-appsearch-release

Change-Id: Ide6c54e11dd4e7da9454b683327ac6a74ce98d40