Snap for 11051817 from 5ad493ce1a6d335af300f7a2b6369b0a9de317f4 to mainline-appsearch-release

Change-Id: I6d4ca5654213ebe0dedc5a812bee905d3ef58261