Snap for 10453563 from e847eb6b4da55720be0ebd32c35b5589646439ad to mainline-appsearch-release

Change-Id: Ib9d549c82e8e443ac89bc27308c782a5ab37793c