Snap for 11698527 from b4480edabfc896898ac3a4d89a3578d7567d0f7a to mainline-appsearch-release

Change-Id: I205e25f5d7c02f985720d27a4e11a36539256940