Snap for 10453563 from d831a8082c5b7373f2731c93a3be4433cc6eba25 to mainline-appsearch-release

Change-Id: I747285c6ae72842f7cc14591b31ca4a91511aa8c