Snap for 10453563 from ea0a57a4c8d7a2cd338cdb53746e570d8d3a5692 to mainline-appsearch-release

Change-Id: I2433df2929688e80a3f496d751d5976bdaf300df