Snap for 10453563 from ce3f8997c5619b4e6e5dc098ff95b6be749ea41e to mainline-appsearch-release Change-Id: I6582bbad677b0ba606eb7f2a05c89f7b5eb7a0f0