Snap for 10453563 from 84de222e9a28ff781de9f4b3d4cd80369c01270d to mainline-appsearch-release

Change-Id: Iad6332461fd541f1af5733fc6cfb4369c231bcd7