Snap for 10453563 from ca7deb5c520590dc0be6eeb7db76ce6246a638c3 to mainline-appsearch-release Change-Id: I8379d022088039085ab4440ecb168f03c9f5ad4e