Snap for 10453563 from bbb101d25e92b5dc80aca428fa355d6e27da9ecc to mainline-appsearch-release

Change-Id: I7bf9dad493de6da0d8009926f234575198ca3dfa