Snap for 10453563 from bbbced136fa7dc2b3bc0df7c3b08f6206cb72356 to mainline-appsearch-release

Change-Id: I9112b241c8853d14fca21d7fe3c00eab86d9e8dd