Snap for 11051817 from 56057076f774011cd0ccef8aae600243b0659534 to mainline-appsearch-release

Change-Id: Ib672ab1c6ec28c1c5c56d117cd05208919552638